diff --git a/fftw-3.3.tar.bz2 b/fftw-3.3.tar.bz2 deleted file mode 100644 index d4e9a27..0000000 --- a/fftw-3.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f704c2fc1060849ea7467b479c62476c28d97e54211d2505831ca383b88e9b1e -size 2945530 diff --git a/fftw-3.3.tar.gz b/fftw-3.3.tar.gz new file mode 100644 index 0000000..94a88a5 --- /dev/null +++ b/fftw-3.3.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d25a98521a13933e678ce19319d03ddc915826764e1e59abd12d172c239b6aea +size 3965713 diff --git a/fftw3-rpmlintrc b/fftw3-rpmlintrc new file mode 100644 index 0000000..a98d9d3 --- /dev/null +++ b/fftw3-rpmlintrc @@ -0,0 +1,4 @@ +# See spec file to see why we need this +setBadness("shlib-policy-name-error", 0) +addFilter('shlib-fixed-dependency') + diff --git a/fftw3.changes b/fftw3.changes index 73c2ac3..ced7718 100644 --- a/fftw3.changes +++ b/fftw3.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 28 13:33:44 UTC 2011 - idoenmez@suse.de + +- Ignore rpmlint fixed dependency errors + ------------------------------------------------------------------- Mon Nov 28 01:48:17 CET 2011 - ro@suse.de diff --git a/fftw3.spec b/fftw3.spec index 741c96f..b050bba 100644 --- a/fftw3.spec +++ b/fftw3.spec @@ -18,19 +18,20 @@ Name: fftw3 -BuildRequires: fdupes gcc-fortran pkgconfig +BuildRequires: fdupes +BuildRequires: gcc-fortran +BuildRequires: pkgconfig %ifnarch s390 s390x BuildRequires: openmpi-devel %endif -Summary: Discrete Fourier Transform (DFT) C Subroutine Library Version: 3.3 -Release: 14 +Release: 0 License: GPLv2+ -Group: Productivity/Scientific/Math -Source: fftw-%{version}.tar.bz2 -# Patch: fftw-%{version}.diff +Summary: Discrete Fourier Transform (DFT) C Subroutine Library Url: http://www.fftw.org -AutoReqProv: on +Group: Productivity/Scientific/Math +Source: http://www.fftw.org/fftw-3.3.tar.gz +Source1: %{name}-rpmlintrc BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(pre): %install_info_prereq @@ -39,11 +40,11 @@ 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 devel Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ -Requires: fftw3 = %{version} glibc-devel +Requires: fftw3 = %{version} +Requires: glibc-devel Provides: fftw-devel %description devel @@ -54,8 +55,8 @@ to develop applications that require these. 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 +Provides: fftw3 = %{version}-%{release} +Obsoletes: fftw3 < %{version}-%{release} %description -n libfftw3-3 FFTW is a C subroutine library for computing the Discrete Fourier @@ -67,43 +68,42 @@ Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # 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 +Requires: libfftw3-3 = %{version} %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 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ -Requires: libfftw3_threads3 = %version -Requires: fftw3-devel = %{version} glibc-devel +Requires: fftw3-devel = %{version} +Requires: glibc-devel +Requires: libfftw3_threads3 = %{version} %description threads-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. - %package -n libfftw3_omp3 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # Same as libfftw3_threads.so: manual Requires for fftw3 main lib -Requires: libfftw3-3 = %version +Requires: libfftw3-3 = %{version} %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 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ +Requires: fftw3-devel = %{version} +Requires: glibc-devel Requires: libfftw3_omp3 = %{version} -Requires: fftw3-devel = %{version} glibc-devel %description openmp-devel FFTW is a C subroutine library for computing the Discrete Fourier @@ -116,7 +116,7 @@ data, and of arbitrary input size. Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Productivity/Scientific/Math # Same as libfftw3_threads.so: manual Requires for fftw3 main lib -Requires: libfftw3-3 = %version +Requires: libfftw3-3 = %{version} Requires: openmpi %description -n libfftw3_mpi3 @@ -124,12 +124,12 @@ 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 Summary: Discrete Fourier Transform (DFT) C subroutine library Group: Development/Libraries/C and C++ +Requires: fftw3-devel = %{version} +Requires: glibc-devel Requires: libfftw3_mpi3 = %{version} -Requires: fftw3-devel = %{version} glibc-devel Requires: openmpi-devel %description mpi-devel @@ -156,8 +156,10 @@ make %{?_smp_mflags} %install %makeinstall + # remove unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a +rm -f %{buildroot}%{_libdir}/lib*.*a + # hack to also compile/install single-precision version: make distclean %configure --enable-shared --enable-threads --enable-float --enable-openmp \ @@ -168,14 +170,19 @@ make distclean --enable-sse \ %endif --disable-static + make %{?_smp_mflags} %makeinstall + # remove unneeded files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.*a -# gzip -9nf $RPM_BUILD_ROOT%{_infodir}/*.info* -rm -f $RPM_BUILD_ROOT%{_infodir}/dir +rm -f %{buildroot}%{_libdir}/lib*.*a + +# gzip -9nf %{buildroot}%{_infodir}/*.info* +rm -f %{buildroot}%{_infodir}/dir + # remove Makefiles in doc directory at last find doc -name 'Makefile*' | xargs rm + %fdupes -s doc %postun devel