From 35cd250401b1027837ea859ebd765b5ca4c25df9 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 30 2021 14:01:05 +0000 Subject: import numpy-1.14.2-16.module+el8.4.0+9406+221a4565 --- diff --git a/SPECS/numpy.spec b/SPECS/numpy.spec index a898dff..8e972b8 100644 --- a/SPECS/numpy.spec +++ b/SPECS/numpy.spec @@ -12,7 +12,7 @@ Name: numpy Version: 1.14.2 -Release: 13%{?dist} +Release: 16%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -241,14 +241,19 @@ popd &> /dev/null #install -D -p -m 0644 docs/f2py/f2py.1 %{buildroot}%{_mandir}/man1/f2py.1 #symlink for includes, BZ 185079 -mkdir -p %{buildroot}/usr/include -ln -s %{python2_sitearch}/%{name}/core/include/numpy/ %{buildroot}/usr/include/numpy +mkdir -p %{buildroot}%{_includedir} +ln -s %{python2_sitearch}/%{name}/core/include/numpy/ %{buildroot}%{_includedir}/numpy %check +# Having LDFLAGS set in the environment (for Flatpak builds, in particular), breaks +# f2py Makefiles which use that variable like: 'LDFLAGS = -s -shared' +unset LDFLAGS pushd doc &> /dev/null -PYTHONPATH="%{buildroot}%{python2_sitearch}" %{__python2} -c "import pkg_resources, numpy ; numpy.test(verbose=2)" \ +PATH="%{buildroot}%{_bindir}:${PATH}" \ +PYTHONPATH="%{buildroot}%{python2_sitearch}" \ +%{__python2} -c "import pkg_resources, numpy, sys ; sys.exit(0 if numpy.test(verbose=2).wasSuccessful() else 1)" \ %ifarch s390 s390x || : %endif @@ -257,7 +262,9 @@ popd &> /dev/null %if %{with python3} pushd doc &> /dev/null -PYTHONPATH="%{buildroot}%{python3_sitearch}" %{__python3} -c "import pkg_resources, numpy ; numpy.test(verbose=2)" \ +PATH="%{buildroot}%{_bindir}:${PATH}" \ +PYTHONPATH="%{buildroot}%{python3_sitearch}" \ +%{__python3} -c "import pkg_resources, numpy, sys ; sys.exit(0 if numpy.test(verbose=2).wasSuccessful() else 1)" \ %ifarch s390 s390x || : %endif @@ -334,6 +341,18 @@ popd &> /dev/null %changelog +* Fri Jan 08 2021 Nikola Forró - 1:1.14.2-16 +- Fix include path +- Related: rhbz#1907601 + +* Wed Dec 16 2020 Nikola Forró - 1:1.14.2-15 +- Fix %check +- Related: rhbz#1907601 + +* Tue Dec 15 2020 Nikola Forró - 1:1.14.2-14 +- Use macros rather than hardcoded paths +- Resolves: rhbz#1907601 + * Wed Jun 05 2019 Nikola Forró - 1:1.14.2-13 - Fix CVE-2019-6446 - Resolves: rhbz#1668829