diff --git a/numpy.spec b/numpy.spec index c419e4f..d8d8cbd 100644 --- a/numpy.spec +++ b/numpy.spec @@ -8,11 +8,19 @@ %bcond_without tests %endif +%if 0%{?fedora} >= 33 || 0%{?rhel} >= 9 +%global blaslib flexiblas +%global blasvar %{nil} +%else +%global blaslib openblas +%global blasvar p +%endif + %global modname numpy Name: numpy Version: 1.19.1 -Release: 2%{?dist} +Release: 3%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -56,11 +64,7 @@ BuildRequires: python3-hypothesis BuildRequires: python3-pytest BuildRequires: python3-test %endif -%ifarch %{openblas_arches} -BuildRequires: openblas-devel -%else -BuildRequires: atlas-devel -%endif +BuildRequires: %{blaslib}-devel %description -n python3-numpy NumPy is a general-purpose array-processing package designed to @@ -103,32 +107,18 @@ This package provides the complete documentation for NumPy. # Force re-cythonization (ifed for PKG-INFO presence in setup.py) rm PKG-INFO -%ifarch %{openblas_arches} +# openblas is provided by flexiblas by default; otherwise, # Use openblas pthreads as recommended by upstream (see comment in site.cfg.example) cat >> site.cfg <= 21 || 0%{?rhel} > 7 -cat >> site.cfg < - 1:1.19.1-3 +- https://fedoraproject.org/wiki/Changes/FlexiBLAS_as_BLAS/LAPACK_manager + * Tue Jul 28 2020 Fedora Release Engineering - 1:1.19.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild