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
This commit is contained in:
parent
d13ca2a5e2
commit
35f3a8dff5
1
.gitignore
vendored
1
.gitignore
vendored
@ -8,3 +8,4 @@ fftw-3.2.2.tar.gz
|
|||||||
>>>>>>> master
|
>>>>>>> master
|
||||||
/fftw-3.3.4.tar.gz
|
/fftw-3.3.4.tar.gz
|
||||||
/fftw-3.3.5.tar.gz
|
/fftw-3.3.5.tar.gz
|
||||||
|
/fftw-3.3.8.tar.gz
|
||||||
|
31
fftw.spec
31
fftw.spec
@ -13,8 +13,8 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: fftw
|
Name: fftw
|
||||||
Version: 3.3.5
|
Version: 3.3.8
|
||||||
Release: 11%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: A Fast Fourier Transform library
|
Summary: A Fast Fourier Transform library
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
@ -43,6 +43,9 @@ BuildRequires: nss-myhostname
|
|||||||
%if %{with openmpi}
|
%if %{with openmpi}
|
||||||
BuildRequires: openmpi-devel
|
BuildRequires: openmpi-devel
|
||||||
%endif
|
%endif
|
||||||
|
%if %{with mpich} || %{with openmpi}
|
||||||
|
BuildRequires: environment-modules
|
||||||
|
%endif
|
||||||
|
|
||||||
Requires(post): info
|
Requires(post): info
|
||||||
Requires(preun): info
|
Requires(preun): info
|
||||||
@ -291,6 +294,10 @@ library.
|
|||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%build
|
%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
|
# Regenerate autoconf files using current tools so proper build flags
|
||||||
# from redhat-rpm-config are used
|
# from redhat-rpm-config are used
|
||||||
autoreconf -vfi
|
autoreconf -vfi
|
||||||
@ -378,6 +385,10 @@ done
|
|||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
# Explicitly load shell support for the environment-modules package, used
|
||||||
|
# below via 'module' pseudo-command.
|
||||||
|
source /etc/profile.d/modules.sh
|
||||||
|
|
||||||
%if %{quad}
|
%if %{quad}
|
||||||
for ver in single double long quad
|
for ver in single double long quad
|
||||||
%else
|
%else
|
||||||
@ -403,6 +414,10 @@ rm -f %{buildroot}%{_infodir}/dir
|
|||||||
find %{buildroot} -name \*.la -delete
|
find %{buildroot} -name \*.la -delete
|
||||||
|
|
||||||
%check
|
%check
|
||||||
|
# Explicitly load shell support for the environment-modules package, used
|
||||||
|
# below via 'module' pseudo-command.
|
||||||
|
source /etc/profile.d/modules.sh
|
||||||
|
|
||||||
bdir=`pwd`
|
bdir=`pwd`
|
||||||
%if %{quad}
|
%if %{quad}
|
||||||
for ver in single double long quad
|
for ver in single double long quad
|
||||||
@ -487,6 +502,8 @@ fi
|
|||||||
%doc doc/FAQ/fftw-faq.html/
|
%doc doc/FAQ/fftw-faq.html/
|
||||||
%doc %{_infodir}/fftw3.info*
|
%doc %{_infodir}/fftw3.info*
|
||||||
%{_includedir}/fftw3*
|
%{_includedir}/fftw3*
|
||||||
|
%dir %{_libdir}/cmake/fftw3/
|
||||||
|
%{_libdir}/cmake/fftw3/*.cmake
|
||||||
%{_libdir}/pkgconfig/fftw3*.pc
|
%{_libdir}/pkgconfig/fftw3*.pc
|
||||||
%{_libdir}/libfftw3*.so
|
%{_libdir}/libfftw3*.so
|
||||||
|
|
||||||
@ -517,6 +534,8 @@ fi
|
|||||||
%files mpich-devel
|
%files mpich-devel
|
||||||
%doc doc/FAQ/fftw-faq.html/
|
%doc doc/FAQ/fftw-faq.html/
|
||||||
%{_includedir}/mpich-%{_arch}
|
%{_includedir}/mpich-%{_arch}
|
||||||
|
%dir %{_libdir}/mpich/lib/cmake/fftw3/
|
||||||
|
%{_libdir}/mpich/lib/cmake/fftw3/*.cmake
|
||||||
%{_libdir}/mpich/lib/pkgconfig/fftw3*.pc
|
%{_libdir}/mpich/lib/pkgconfig/fftw3*.pc
|
||||||
%{_libdir}/mpich/lib/libfftw3*.so
|
%{_libdir}/mpich/lib/libfftw3*.so
|
||||||
|
|
||||||
@ -545,6 +564,8 @@ fi
|
|||||||
%files openmpi-devel
|
%files openmpi-devel
|
||||||
%doc doc/FAQ/fftw-faq.html/
|
%doc doc/FAQ/fftw-faq.html/
|
||||||
%{_includedir}/openmpi-%{_arch}
|
%{_includedir}/openmpi-%{_arch}
|
||||||
|
%dir %{_libdir}/openmpi/lib/cmake/fftw3/
|
||||||
|
%{_libdir}/openmpi/lib/cmake/fftw3/*.cmake
|
||||||
%{_libdir}/openmpi/lib/pkgconfig/fftw3*.pc
|
%{_libdir}/openmpi/lib/pkgconfig/fftw3*.pc
|
||||||
%{_libdir}/openmpi/lib/libfftw3*.so
|
%{_libdir}/openmpi/lib/libfftw3*.so
|
||||||
|
|
||||||
@ -553,6 +574,12 @@ fi
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jun 11 2018 Conrad Meyer <cemeyer@uw.edu> - 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 <mmathesi@redhat.com> - 3.3.5-11
|
* Wed Apr 18 2018 Merlin Mathesius <mmathesi@redhat.com> - 3.3.5-11
|
||||||
- Regenerate autoconf files using current tools so proper build flags
|
- Regenerate autoconf files using current tools so proper build flags
|
||||||
from redhat-rpm-config are used. This resolves BZ#1548473.
|
from redhat-rpm-config are used. This resolves BZ#1548473.
|
||||||
|
Loading…
Reference in New Issue
Block a user