rpms/fftw/EL-5 fftw.spec,1.22,1.23 sources,1.5,1.6

[Jussi Lehtola]

Author: jussilehtola

Update of /cvs/pkgs/rpms/fftw/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18507

Modified Files:
	fftw.spec sources 
Log Message:
Update to 3.2.2.


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-5/fftw.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- fftw.spec	25 Jun 2008 15:30:01 -0000	1.22
+++ fftw.spec	2 Jan 2010 00:24:34 -0000	1.23
@@ -1,67 +1,43 @@
-
 Name:           fftw
-Version:        3.1.2
-Release:        5%{?dist}.1
+Version:        3.2.2
+Release:        1%{?dist}
 Summary:        Fast Fourier Transform library
-
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.fftw.org/
-Source0:        ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz
+Source0:        http://www.fftw.org/fftw-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{?fedora} > 3 || 0%{?rhel} > 4
-BuildRequires:  gcc-gfortran
-%else
+%if 0%{?rhel} == 4
 BuildRequires:  gcc-g77
-%endif
-BuildRequires: time perl
-
-# rpmforge compatibility
-%if 0%{?rhel} > 1
-%define name_compat fftw3
 %else
-%define name_compat %{name}
+BuildRequires:  gcc-gfortran
 %endif
+# For check phase
+BuildRequires: time perl
 
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
-
-%description
-FFTW is a C subroutine library for computing the Discrete Fourier
-Transform (DFT) in one or more dimensions, of both real and complex
-data, and of arbitrary input size.
-
-%if "%{name}" == "%{name_compat}"
+Requires(post): info 
+Requires(preun): info
 
 Provides:       fftw3 = %{version}-%{release}
-Obsoletes:      fftw3 < 3.1
-
-%else
+Obsoletes:      fftw3 < %{version}-%{release}
 
-%package -n %{name_compat}
-Summary:        Fast Fourier Transform library 
-Group:          System Environment/Libraries 
-Provides:	%{name} = %{version}-%{release}
-%description -n %{name_compat}
+%description
 FFTW is a C subroutine library for computing the Discrete Fourier
 Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
 
-%endif
 
-%package -n %{name_compat}-devel
+%package        devel
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
-Requires:       %{name_compat} = %{version}-%{release}
-Requires:	pkgconfig
-%if "%{name}" == "%{name_compat}"
+Requires:       %{name} = %{version}-%{release} pkgconfig
+
 Provides:       fftw3-devel = %{version}-%{release}
-Obsoletes:      fftw3-devel < 3.1
-%else
-Provides:	%{name}-devel = %{version}-%{release}
-%endif
-%description -n %{name_compat}-devel
+Obsoletes:      fftw3-devel < %{version}-%{release}
+
+
+%description    devel
 FFTW is a C subroutine library for computing the Discrete Fourier
 Transform (DFT) in one or more dimensions, of both real and complex
 data, and of arbitrary input size.
@@ -70,95 +46,108 @@ This package contains header files and d
 develop programs using the FFTW fast Fourier transform library.
 
 
+%package        static
+Summary:        Static version of the FFTW library
+Group:          Development/Libraries
+Requires:       %{name}-devel = %{version}-%{release}
+Obsoletes:	fftw3-static < %{version}-%{release}
+Provides:       fftw3-static = %{version}-%{release}
+
+%description    static
+The fftw-static package contains the statically linkable version of
+the FFTW fast Fourier transform library.
+
+
 %prep
 %setup -q -c %{name}-%{version}
-mv %{name}-%{version} single
-cp -a single double
-cp -a single long
+for dir in single double long; do
+  cp -a fftw-%{version} $dir
+done
+rm -rf fftw-%{version}
 
 
 %build
-CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
+# Set Fortran compiler to be used
+%if 0%{?rhel} == 4
+export F77=g77
+%else
+export F77=gfortran
+%endif
 
+CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
 pushd double
 	%configure $CONFIG_FLAGS
 	make %{?_smp_mflags}
 popd
-
 pushd single
 	%configure $CONFIG_FLAGS --enable-single
 	make %{?_smp_mflags}
 popd
-
 pushd long
 	%configure $CONFIG_FLAGS --enable-long-double
 	make %{?_smp_mflags}
 popd
 
 
-
-
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
-# grab copy of docs
 pushd double
+	make install DESTDIR=${RPM_BUILD_ROOT}
 	cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../
 	cp -a doc/ ../
 popd
-
-make install DESTDIR=${RPM_BUILD_ROOT} -C double
-make install DESTDIR=${RPM_BUILD_ROOT} -C single
-make install DESTDIR=${RPM_BUILD_ROOT} -C long
-
-# Unpackaged files
+pushd single
+	make install DESTDIR=${RPM_BUILD_ROOT}
+popd
+pushd long
+	make install DESTDIR=${RPM_BUILD_ROOT}
+popd
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
-
-
-%check
-%if 0%{!?_without_check:1}
-time make check -C double
-time make check -C single
-time make check -C long
-%endif
-
+find ${RPM_BUILD_ROOT}%{_libdir} -name *.la -delete
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
+%check
+make check
 
-%post -n %{name_compat} -p /sbin/ldconfig
-
-%postun -n %{name_compat} -p /sbin/ldconfig
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
 
-%post -n %{name_compat}-devel
+%post devel
 /sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
-%preun -n %{name_compat}-devel
+%preun devel
 if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
 fi
 
-
-%files -n %{name_compat}
+%files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
-%{_bindir}/*
-%{_libdir}/lib*.so.*
-%{_mandir}/man?/*
+%doc %{_mandir}/man1/fftw*.1.*
+%{_bindir}/fftw*-wisdom*
+%{_libdir}/libfftw3*.so.*
 
-%files -n %{name_compat}-devel
+%files devel
 %defattr(-,root,root,-)
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
-%{_includedir}/*
-%{_infodir}/*.info*
-%{_libdir}/pkgconfig/*
-%{_libdir}/lib*.so
-%{_libdir}/lib*.a
+%doc %{_infodir}/fftw3.info*
+%{_includedir}/fftw3.*
+%{_libdir}/pkgconfig/fftw3*.pc
+%{_libdir}/libfftw3*.so
+
+%files static
+%defattr(-,root,root,-)
+%{_libdir}/libfftw3*.a
 
 
 %changelog
+* Fri Jan 1 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-1
+- Update to 3.2.2 from rawhide tree.
+- Change name of package to fftw(-devel) to conform with Package Naming
+  Guidelines.
+
 * Wed Jun 25 2008 Rex Dieter <rdieter at fedoraproject.org> 3.1.2-5.1
 - re-enable %%check
 - License: GPLv2+
@@ -171,7 +160,7 @@ fi
 - (re)name -> fftw3 (epel-only, for rpmforge compatibility, #246004)
 
 * Thu Oct 05 2006 Christian Iseli <Christian.Iseli at licr.org> 3.1.2-3
- - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
 
 * Tue Sep 26 2006 Quentin Spencer <qspencer at users.sf.net> 3.1.2-2
 - BuildRequires: pkgconfig for -devel (bug 206444).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	8 Sep 2006 18:07:40 -0000	1.5
+++ sources	2 Jan 2010 00:24:35 -0000	1.6
@@ -1 +1 @@
-08f2e21c9fd02f4be2bd53a62592afa4  fftw-3.1.2.tar.gz
+b616e5c91218cc778b5aa735fefb61ae  fftw-3.2.2.tar.gz