diff --git a/baselibs.conf b/baselibs.conf index 4f0dece..4239941 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,4 +1,4 @@ -fftw3 -fftw3-threads -fftw3-omp -fftw3-mpi +libfftw3-3 +libfftw3_threads3 +libfftw3_omp3 +libfftw3_mpi3 diff --git a/fftw3.changes b/fftw3.changes index 35eaaff..ec18695 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Nov 21 17:45:00 UTC 2011 - jengelh@medozas.de + +- Remove redundant/unwanted tags/section (cf. specfile guidelines) +- Employ shlib naming (fftw3 -> libfftw3) + ------------------------------------------------------------------- Sun Oct 9 17:48:50 UTC 2011 - adrian@suse.de diff --git a/fftw3.spec b/fftw3.spec index 003e71f..2416a2e 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: fftw3 @@ -27,7 +26,7 @@ License: GPLv2+ Group: Productivity/Scientific/Math Source: fftw-%{version}.tar.bz2 # Patch: fftw-%{version}.diff -Url: http://www.fftw.org +URL: http://www.fftw.org AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %install_info_prereq @@ -39,7 +38,6 @@ data, and of arbitrary input size. %package devel -License: GPLv2+ Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: fftw3 = %{version} glibc-devel @@ -49,24 +47,35 @@ Provides: fftw-devel This package contains all necessary include files and libraries needed to develop applications that require these. +%package -n libfftw3-3 +Summary: Discrete Fourier Transform (DFT) C Subroutine Library +Group: System/Libraries +# Remove Prov/Obs when appropriate; were added 2011-Nov-21 (post-openSUSE-12.1) +Provides: fftw3 = %version-%release +Obsoletes: fftw3 < %version-%release -%package threads -License: GPLv2+ +%description -n libfftw3-3 +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 libfftw3_threads3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math -Requires: fftw3 = %{version} +# libfftw3_threads.so does not have a DT_NEEDED entry for fftw symbols, since it +# may be used with either libfftw3.so or libfftw3f.so. Hence, manual Requires. +Requires: libfftw3-3 = %version -%description threads +%description -n libfftw3_threads3 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 threads-devel -License: GPLv2+ Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: fftw3-threads = %{version} +Requires: libfftw3_threads3 = %version Requires: fftw3-devel = %{version} glibc-devel %description threads-devel @@ -75,23 +84,22 @@ Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. -%package openmp -License: GPLv2+ +%package -n libfftw3_omp3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math -Requires: fftw3 = %{version} +# Same as libfftw3_threads.so: manual Requires for fftw3 main lib +Requires: libfftw3-3 = %version -%description openmp +%description -n libfftw3_omp3 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 openmp-devel -License: GPLv2+ Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: fftw3-openmp = %{version} +Requires: libfftw3_omp3 = %{version} Requires: fftw3-devel = %{version} glibc-devel %description openmp-devel @@ -100,24 +108,23 @@ Transform (DFT) in one or more dimensions, of both real and complex data, and of arbitrary input size. -%package mpi -License: GPLv2+ +%package -n libfftw3_mpi3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math -Requires: fftw3 = %{version} +# Same as libfftw3_threads.so: manual Requires for fftw3 main lib +Requires: libfftw3-3 = %version Requires: openmpi -%description mpi +%description -n libfftw3_mpi3 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 mpi-devel -License: GPLv2+ Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: fftw3-mpi = %{version} +Requires: libfftw3_mpi3 = %{version} Requires: fftw3-devel = %{version} glibc-devel Requires: openmpi-devel @@ -167,29 +174,26 @@ find doc -name 'Makefile*' | xargs rm %post devel %install_info --info-dir=%{_infodir} %{_infodir}/fftw3.info.gz -%post -p /sbin/ldconfig +%post -n libfftw3-3 -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%postun -n libfftw3-3 -p /sbin/ldconfig -%post threads -p /sbin/ldconfig +%post -n libfftw3_threads3 -p /sbin/ldconfig -%postun threads -p /sbin/ldconfig +%postun -n libfftw3_threads3 -p /sbin/ldconfig -%post openmp -p /sbin/ldconfig +%post -n libfftw3_omp3 -p /sbin/ldconfig -%postun openmp -p /sbin/ldconfig +%postun -n libfftw3_omp3 -p /sbin/ldconfig -%post mpi -p /sbin/ldconfig +%post -n libfftw3_mpi3 -p /sbin/ldconfig -%postun mpi -p /sbin/ldconfig +%postun -n libfftw3_mpi3 -p /sbin/ldconfig -%clean -test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT - -%files +%files -n libfftw3-3 %defattr(-,root,root) -%{_libdir}/libfftw3.so.* -%{_libdir}/libfftw3f.so.* +%{_libdir}/libfftw3.so.3* +%{_libdir}/libfftw3f.so.3* %files devel %defattr(-,root,root) @@ -203,30 +207,30 @@ test "$RPM_BUILD_ROOT" != "/" -a -d "$RPM_BUILD_ROOT" && rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/*.pc %{_bindir}/* -%files threads +%files -n libfftw3_threads3 %defattr(-,root,root) -%{_libdir}/libfftw3_threads.so.* -%{_libdir}/libfftw3f_threads.so.* +%{_libdir}/libfftw3_threads.so.3* +%{_libdir}/libfftw3f_threads.so.3* %files threads-devel %defattr(-,root,root) %{_libdir}/libfftw3_threads.so %{_libdir}/libfftw3f_threads.so -%files openmp +%files -n libfftw3_omp3 %defattr(-,root,root) -%{_libdir}/libfftw3_omp.so.* -%{_libdir}/libfftw3f_omp.so.* +%{_libdir}/libfftw3_omp.so.3* +%{_libdir}/libfftw3f_omp.so.3* %files openmp-devel %defattr(-,root,root) %{_libdir}/libfftw3_omp.so %{_libdir}/libfftw3f_omp.so -%files mpi +%files -n libfftw3_mpi3 %defattr(-,root,root) -%{_libdir}/libfftw3_mpi.so.* -%{_libdir}/libfftw3f_mpi.so.* +%{_libdir}/libfftw3_mpi.so.3* +%{_libdir}/libfftw3f_mpi.so.3* %files mpi-devel %defattr(-,root,root)