rpms/fftw/devel fftw.spec,1.32,1.33

Jussi Lehtola jussilehtola at fedoraproject.org
Sat Jan 9 08:41:00 UTC 2010


Author: jussilehtola

Update of /cvs/pkgs/rpms/fftw/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25996

Modified Files:
	fftw.spec 
Log Message:
Get rid of rpath.


Index: fftw.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fftw/devel/fftw.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -p -r1.32 -r1.33
--- fftw.spec	8 Jan 2010 22:24:58 -0000	1.32
+++ fftw.spec	9 Jan 2010 08:41:00 -0000	1.33
@@ -1,6 +1,6 @@
 Name:           fftw
 Version:        3.2.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A Fast Fourier Transform library
 Group:          System Environment/Libraries
 License:        GPLv2+
@@ -78,36 +78,44 @@ 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
 
 %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
@@ -151,6 +159,9 @@ fi
 
 
 %changelog
+* Sat Jan 9 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 3.2.2-4
+- Get rid of rpath.
+
 * Sat Jan 9 2010 Jussi Lehtola <jussilehtola at fedoraproject.org> - 3.2.2-3
 - Branch out developers' manual to -doc.
 




More information about the fedora-extras-commits mailing list