rpms/fftw/EL-5 fftw.spec,1.18,1.19

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/fftw/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1291

Modified Files:
	fftw.spec 
Log Message:
* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraprojet.org> 3.1.2-4
- (re)name -> fftw3 (epel-only, for rpmforge compatibility)



Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-5/fftw.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- fftw.spec	4 Oct 2006 22:13:13 -0000	1.18
+++ fftw.spec	12 Jul 2007 15:25:46 -0000	1.19
@@ -1,6 +1,7 @@
+
 Name:           fftw
 Version:        3.1.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Fast Fourier Transform library
 
 Group:          System Environment/Libraries
@@ -9,29 +10,54 @@
 Source0:        ftp://ftp.fftw.org/pub/fftw/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?fedora} > 3 || 0%{?rhel} > 4
 BuildRequires:  gcc-gfortran
+%else
+BuildRequires:  gcc-g77
+%endif
+
+# rpmforge compatibility
+%if 0%{?rhel} > 1
+%define name_compat fftw3
+%else
+%define name_compat %{name}
+%endif
+
 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}"
+
 Provides:       fftw3 = %{version}-%{release}
 Obsoletes:      fftw3 < 3.1
 
-%description
+%else
+
+%package -n %{name_compat}
+Summary:        Fast Fourier Transform library 
+Group:          System Environment/Libraries 
+%description -n %{name_compat}
 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        devel
+%package -n %{name_compat}-devel
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release} pkgconfig
-
+Requires:       %{name_compat} = %{version}-%{release}
+Requires:	pkgconfig
+%if "%{name}" == "%{name_compat}"
 Provides:       fftw3-devel = %{version}-%{release}
 Obsoletes:      fftw3-devel < 3.1
-
-
-%description    devel
+%endif
+%description -n %{name_compat}-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.
@@ -49,14 +75,17 @@
 
 %build
 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}
@@ -65,57 +94,64 @@
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
+
 pushd double
 	make install DESTDIR=${RPM_BUILD_ROOT}
 	cp -a AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO ../
 	cp -a doc/ ../
 popd
+
 pushd single
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+
 pushd long
 	make install DESTDIR=${RPM_BUILD_ROOT}
 popd
+
+# Unpackaged files
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
+rm -f ${RPM_BUILD_ROOT}%{_libdir}/lib*.la
 
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
 
 
-%post -p /sbin/ldconfig
-
+%post -n %{name_compat} -p /sbin/ldconfig
 
-%postun -p /sbin/ldconfig
+%postun -n %{name_compat} -p /sbin/ldconfig
 
-
-%post devel
+%post -n %{name_compat}-devel
 /sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
-%preun devel
+%preun -n %{name_compat}-devel
 if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
 fi
 
 
-%files
+%files -n %{name_compat}
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
-%doc %{_mandir}/man?/*
 %{_bindir}/*
-%{_libdir}/*.so.*
+%{_libdir}/lib*.so.*
+%{_mandir}/man?/*
 
-%files devel
+%files -n %{name_compat}-devel
 %defattr(-,root,root,-)
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
-%doc %{_infodir}/*.info*
-%exclude %{_libdir}/*.la
-%{_libdir}/*.a
 %{_includedir}/*
+%{_infodir}/*.info*
 %{_libdir}/pkgconfig/*
-%{_libdir}/*.so
+%{_libdir}/lib*.so
+%{_libdir}/lib*.a
+
 
 %changelog
+* Tue Jul 10 2007 Rex Dieter <rdieter[AT]fedoraprojet.org> 3.1.2-4
+- (re)name -> fftw3 (epel-only, for rpmforge compatibility)
+
 * 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