rpms/fftw/EL-4 fftw.spec,1.11,1.12

Jussi Lehtola jussilehtola at fedoraproject.org
Sat Jan 9 08:42:38 UTC 2010


Author: jussilehtola

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

Modified Files:
	fftw.spec 
Log Message:
Use Name: fftw to be able to build. Get rid of rpath.


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/EL-4/fftw.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- fftw.spec	8 Jan 2010 21:51:23 -0000	1.11
+++ fftw.spec	9 Jan 2010 08:42:38 -0000	1.12
@@ -1,11 +1,6 @@
-# For RPMForge compatibility - the fftw package was in RPMForge before Fedora
-# EPEL was started, and is of version 2, which is API incompatible with the 3
-# series.
-Name:           fftw3
-Provides:       fftw = %{version}-%{release}
-
+Name:           fftw
 Version:        3.2.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -24,21 +19,34 @@ BuildRequires: time perl
 Requires(post): info 
 Requires(preun): 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.
 
+# For RPMForge compatibility - the fftw package was in RPMForge before Fedora
+# EPEL was started, and is of version 2, which is API incompatible with the 3
+# series.
 
-%package        devel
+%package -n fftw3
+Summary:        Fast Fourier Transform library
+Group:          System Environment/Libraries
+Provides:       fftw = %{version}-%{release}
+
+%description -n fftw3
+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.
+
+
+%package -n fftw3-devel
 Summary:        Headers, libraries and docs for the FFTW library
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release} pkgconfig
-Requires:	pkgconfig
+Requires:       fftw3 = %{version}-%{release} pkgconfig
+Requires:       pkgconfig
 Provides:       fftw-devel = %{version}-%{release}
 
-%description    devel
+%description -n fftw3-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.
@@ -47,13 +55,13 @@ This package contains header files and d
 develop programs using the FFTW fast Fourier transform library.
 
 
-%package        static
+%package -n fftw3-static
 Summary:        Static version of the FFTW library
 Group:          Development/Libraries
 Requires:       %{name}-devel = %{version}-%{release}
 Provides:       fftw-static = %{version}-%{release}
 
-%description    static
+%description -n fftw3-static
 The fftw-static package contains the statically linkable version of
 the FFTW fast Fourier transform library.
 
@@ -76,31 +84,37 @@ export F77=gfortran
 
 CONFIG_FLAGS="--enable-shared --disable-dependency-tracking --enable-threads"
 pushd double
-	%configure $CONFIG_FLAGS
-	make %{?_smp_mflags}
+        %configure $CONFIG_FLAGS
+        sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+        sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+        make %{?_smp_mflags}
 popd
 pushd single
-	%configure $CONFIG_FLAGS --enable-single
-	make %{?_smp_mflags}
+        %configure $CONFIG_FLAGS --enable-single
+        sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+        sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+        make %{?_smp_mflags}
 popd
 pushd long
-	%configure $CONFIG_FLAGS --enable-long-double
-	make %{?_smp_mflags}
+        %configure $CONFIG_FLAGS --enable-long-double
+        sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
+        sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
+        make %{?_smp_mflags}
 popd
 
 
 %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/ ../
+        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}
+        make install DESTDIR=${RPM_BUILD_ROOT}
 popd
 pushd long
-	make install DESTDIR=${RPM_BUILD_ROOT}
+        make install DESTDIR=${RPM_BUILD_ROOT}
 popd
 rm -f ${RPM_BUILD_ROOT}%{_infodir}/dir
 rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
@@ -109,29 +123,31 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/*.la
 rm -rf ${RPM_BUILD_ROOT}
 
 %check
+bdir=`pwd`
+export LD_LIBRARY_PATH=$bdir/single/.libs:$bdir/single/threads/.libs:$bdir/double/.libs:$bdir/double/threads/.libs:$bdir/long/.libs:$bdir/long/threads/.libs
 make -C single check
 make -C double check
 make -C long check
 
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
+%post -n fftw3 -p /sbin/ldconfig
+%postun -n fftw3 -p /sbin/ldconfig
 
-%post devel
+%post -n fftw3-devel
 /sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir  2>/dev/null || :
 
-%preun devel
+%preun -n fftw3-devel
 if [ "$1" = 0 ]; then
   /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || :
 fi
 
-%files
+%files -n fftw3
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING COPYRIGHT ChangeLog NEWS README* TODO
 %doc %{_mandir}/man1/fftw*.1.*
 %{_bindir}/fftw*-wisdom*
 %{_libdir}/libfftw3*.so.*
 
-%files devel
+%files -n fftw3-devel
 %defattr(-,root,root,-)
 %doc doc/*.pdf doc/html/* doc/FAQ/fftw-faq.html/
 %doc %{_infodir}/fftw3.info*
@@ -139,12 +155,15 @@ fi
 %{_libdir}/pkgconfig/fftw3*.pc
 %{_libdir}/libfftw3*.so
 
-%files static
+%files -n fftw3-static
 %defattr(-,root,root,-)
 %{_libdir}/libfftw3*.a
 
 
 %changelog
+* Fri Jan 8 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-3
+- Same thing, but without changing Name tag to fftw3.
+
 * Fri Jan 8 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> 3.2.2-2
 - Revert package name change due to RPMForge compatibility (fftw is version 2
   series in RPMForge).




More information about the fedora-extras-commits mailing list