diff --git a/download b/download new file mode 100644 index 0000000000000000000000000000000000000000..af87ccd24d14487fe28f1aa9f1ed9a119494d196 --- /dev/null +++ b/download @@ -0,0 +1 @@ +8aac833c943d8e90d51b697b27d4384d fftw-3.3.8.tar.gz diff --git a/fftw-3.3.5.tar.gz b/fftw-3.3.5.tar.gz deleted file mode 100644 index 5520368f6826b5c7ee300cc67d679517f7f7b088..0000000000000000000000000000000000000000 Binary files a/fftw-3.3.5.tar.gz and /dev/null differ diff --git a/fftw.spec b/fftw.spec index 101fb4a3cf276c3f623d27b9fb3b66e0ab85900e..cd85c3c56d2d2f022bbf2cb475f7e616b850de5e 100644 --- a/fftw.spec +++ b/fftw.spec @@ -13,10 +13,9 @@ Name: fftw -Version: 3.3.5 -Release: 11%{?dist} +Version: 3.3.8 +Release: 12%{?dist} Summary: A Fast Fourier Transform library -Group: System Environment/Libraries License: GPLv2+ URL: http://www.fftw.org Source0: http://www.fftw.org/fftw-%{version}.tar.gz @@ -43,9 +42,10 @@ BuildRequires: nss-myhostname %if %{with openmpi} BuildRequires: openmpi-devel %endif - -Requires(post): info -Requires(preun): info +%if %{with mpich} || %{with openmpi} +BuildRequires: environment-modules +%endif +BuildRequires: make %description @@ -55,7 +55,6 @@ data, and of arbitrary input size. %package libs Summary: FFTW run-time library -Group: System Environment/Libraries Provides: fftw3 = %{version}-%{release} # Libs rearranged in 3.3.1-2 Obsoletes: fftw-libs-threads < %{version}-%{release} @@ -76,7 +75,6 @@ run-time libraries. %package devel Summary: Headers, libraries and docs for the FFTW library -Group: Development/Libraries Requires: pkgconfig Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} @@ -93,21 +91,18 @@ develop programs using the FFTW fast Fourier transform library. %package libs-double Summary: FFTW library, double precision -Group: Development/Libraries %description libs-double This package contains the FFTW library compiled in double precision. %package libs-single Summary: FFTW library, single precision -Group: Development/Libraries %description libs-single This package contains the FFTW library compiled in single precision. %package libs-long Summary: FFTW library, long double precision -Group: Development/Libraries %description libs-long This package contains the FFTW library compiled in long double @@ -116,7 +111,6 @@ precision. %if %{quad} %package libs-quad Summary: FFTW library, quadruple -Group: Development/Libraries %description libs-quad This package contains the FFTW library compiled in quadruple @@ -125,7 +119,6 @@ precision. %package static Summary: Static versions of the FFTW libraries -Group: Development/Libraries Requires: %{name}-devel%{?_isa} = %{version}-%{release} Provides: fftw3-static%{?_isa} = %{version}-%{release} Provides: fftw3-static = %{version}-%{release} @@ -137,7 +130,6 @@ the FFTW fast Fourier transform library. %if %{with mpich} %package mpich-libs Summary: FFTW MPICH run-time library -Group: System Environment/Libraries Provides: fftw3-mpich = %{version}-%{release} # Pull in the actual libraries @@ -152,7 +144,6 @@ MPICH run-time libraries. %package mpich-devel Summary: Headers, libraries and docs for the FFTW MPICH library -Group: Development/Libraries Requires: mpich-devel Requires: pkgconfig Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -170,7 +161,6 @@ develop programs using the FFTW fast Fourier transform library for MPICH. %package mpich-libs-double Summary: FFTW MPICH library, double precision -Group: Development/Libraries Requires: %{name}-libs-double%{?_isa} = %{version}-%{release} %description mpich-libs-double @@ -178,7 +168,6 @@ This package contains the FFTW MPICH library compiled in double precision. %package mpich-libs-single Summary: FFTW MPICH library, single precision -Group: Development/Libraries Requires: %{name}-libs-single%{?_isa} = %{version}-%{release} %description mpich-libs-single @@ -186,7 +175,6 @@ This package contains the FFTW MPICH library compiled in single precision. %package mpich-libs-long Summary: FFTW MPICH library, long double precision -Group: Development/Libraries Requires: %{name}-libs-long%{?_isa} = %{version}-%{release} %description mpich-libs-long @@ -195,7 +183,6 @@ precision. %package mpich-static Summary: Static versions of the FFTW MPICH libraries -Group: Development/Libraries Requires: %{name}-mpich-devel%{?_isa} = %{version}-%{release} Requires: %{name}-static%{?_isa} = %{version}-%{release} Provides: fftw3-mpich-static%{?_isa} = %{version}-%{release} @@ -209,7 +196,6 @@ the FFTW fast Fourier transform library for MPICh. %if %{with openmpi} %package openmpi-libs Summary: FFTW OpenMPI run-time library -Group: System Environment/Libraries Provides: fftw3-openmpi = %{version}-%{release} # Pull in the actual libraries @@ -224,7 +210,6 @@ OpenMPI run-time libraries. %package openmpi-devel Summary: Headers, libraries and docs for the FFTW OpenMPI library -Group: Development/Libraries Requires: openmpi-devel Requires: pkgconfig Requires: %{name}-devel%{?_isa} = %{version}-%{release} @@ -242,7 +227,6 @@ develop programs using the FFTW fast Fourier transform library for OpenMPI. %package openmpi-libs-double Summary: FFTW OpenMPI library, double precision -Group: Development/Libraries Requires: %{name}-libs-double%{?_isa} = %{version}-%{release} %description openmpi-libs-double @@ -250,7 +234,6 @@ This package contains the FFTW OpenMPI library compiled in double precision. %package openmpi-libs-single Summary: FFTW OpenMPI library, single precision -Group: Development/Libraries Requires: %{name}-libs-single%{?_isa} = %{version}-%{release} %description openmpi-libs-single @@ -258,7 +241,6 @@ This package contains the FFTW OpenMPI library compiled in single precision. %package openmpi-libs-long Summary: FFTW OpenMPI library, long double precision -Group: Development/Libraries Requires: %{name}-libs-long%{?_isa} = %{version}-%{release} %description openmpi-libs-long @@ -267,7 +249,6 @@ precision. %package openmpi-static Summary: Static versions of the FFTW OpenMPI libraries -Group: Development/Libraries Requires: %{name}-openmpi-devel%{?_isa} = %{version}-%{release} Requires: %{name}-static%{?_isa} = %{version}-%{release} Provides: fftw3-openmpi-static%{?_isa} = %{version}-%{release} @@ -280,7 +261,6 @@ the FFTW fast Fourier transform library for MPICh. %package doc Summary: FFTW library manual -Group: Documentation BuildArch: noarch %description doc @@ -291,6 +271,10 @@ library. %setup -q %build +# Explicitly load shell support for the environment-modules package, used +# below via 'module' pseudo-command. +source /etc/profile.d/modules.sh + # Regenerate autoconf files using current tools so proper build flags # from redhat-rpm-config are used autoreconf -vfi @@ -378,6 +362,10 @@ done %install +# Explicitly load shell support for the environment-modules package, used +# below via 'module' pseudo-command. +source /etc/profile.d/modules.sh + %if %{quad} for ver in single double long quad %else @@ -403,6 +391,10 @@ rm -f %{buildroot}%{_infodir}/dir find %{buildroot} -name \*.la -delete %check +# Explicitly load shell support for the environment-modules package, used +# below via 'module' pseudo-command. +source /etc/profile.d/modules.sh + bdir=`pwd` %if %{quad} for ver in single double long quad @@ -421,9 +413,6 @@ done export OMPI_MCA_btl="^vader" %endif %endif -# disable tests on ppc64 and ppc64le for now -# https://github.com/FFTW/fftw3/issues/145 -%ifnarch ppc64 ppc64le for mpi in %{mpi_list} do module load mpi/${mpi}-%{_arch} @@ -441,15 +430,6 @@ done %if %{quad} %ldconfig_scriptlets libs-quad %endif -%endif - -%post devel -/sbin/install-info --section="Math" %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : - -%preun devel -if [ "$1" = 0 ]; then - /sbin/install-info --delete %{_infodir}/%{name}.info.gz %{_infodir}/dir 2>/dev/null || : -fi %files %{_mandir}/man1/fftw*.1* @@ -491,6 +471,8 @@ fi %doc doc/FAQ/fftw-faq.html/ %doc %{_infodir}/fftw3.info* %{_includedir}/fftw3* +%dir %{_libdir}/cmake/fftw3/ +%{_libdir}/cmake/fftw3/*.cmake %{_libdir}/pkgconfig/fftw3*.pc %{_libdir}/libfftw3*.so @@ -521,6 +503,8 @@ fi %files mpich-devel %doc doc/FAQ/fftw-faq.html/ %{_includedir}/mpich-%{_arch} +%dir %{_libdir}/mpich/lib/cmake/fftw3/ +%{_libdir}/mpich/lib/cmake/fftw3/*.cmake %{_libdir}/mpich/lib/pkgconfig/fftw3*.pc %{_libdir}/mpich/lib/libfftw3*.so @@ -549,6 +533,8 @@ fi %files openmpi-devel %doc doc/FAQ/fftw-faq.html/ %{_includedir}/openmpi-%{_arch} +%dir %{_libdir}/openmpi/lib/cmake/fftw3/ +%{_libdir}/openmpi/lib/cmake/fftw3/*.cmake %{_libdir}/openmpi/lib/pkgconfig/fftw3*.pc %{_libdir}/openmpi/lib/libfftw3*.so @@ -557,6 +543,47 @@ fi %endif %changelog +* Mon Aug 09 2021 Mohan Boddu - 3.3.8-12 +- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags + Related: rhbz#1991688 + +* Thu Apr 15 2021 Mohan Boddu - 3.3.8-11 +- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 + +* Tue Jan 26 2021 Fedora Release Engineering - 3.3.8-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sat Aug 01 2020 Fedora Release Engineering - 3.3.8-9 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 3.3.8-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jan 28 2020 Fedora Release Engineering - 3.3.8-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Jul 25 2019 Fedora Release Engineering - 3.3.8-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Thu Mar 7 2019 Tim Landscheidt - 3.3.8-5 +- Remove obsolete requirements for %%post/%%preun scriptlets + +* Thu Feb 14 2019 Orion Poplawski - 3.3.8-4 +- Rebuild for openmpi 3.1.3 + +* Thu Jan 31 2019 Fedora Release Engineering - 3.3.8-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Fri Jul 13 2018 Fedora Release Engineering - 3.3.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon Jun 11 2018 Conrad Meyer - 3.3.8-1 +- Update to latest upstream, 3.3.8 (rhbz# 1413425) +- Add missing BuildRequires on environment-modules, used in 43b91c1c ("Build + mpich and openmpi versions") without explicit BR dependency +- Add new cmake files to %%files + * Wed Apr 18 2018 Merlin Mathesius - 3.3.5-11 - Regenerate autoconf files using current tools so proper build flags from redhat-rpm-config are used. This resolves BZ#1548473.