From dfdf21868b5432395cd899a88fe4c9f5ddeb7c3b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 5 Nov 2019 14:04:07 -0500 Subject: [PATCH] import scipy-1.0.0-20.module+el8.1.0+3323+7ac3e00f --- SPECS/scipy.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/SPECS/scipy.spec b/SPECS/scipy.spec index 0fcc0cd..11d3a84 100644 --- a/SPECS/scipy.spec +++ b/SPECS/scipy.spec @@ -16,7 +16,7 @@ Summary: Scientific Tools for Python Name: scipy Version: 1.0.0 -Release: 19%{?dist} +Release: 20%{?dist} Group: Development/Libraries # BSD -- whole package except: @@ -34,7 +34,6 @@ BuildRequires: python2-pytest BuildRequires: python2-six # Disabled BR on pytest-xdist since it doesn't seem to be actually needed # BuildRequires: python2-pytest-xdist -Requires: python2-six %endif BuildRequires: fftw-devel, blas-devel, lapack-devel, suitesparse-devel @@ -59,7 +58,6 @@ BuildRequires: python3-pytest BuildRequires: python3-six # Disabled BR on pytest-xdist since it doesn't seem to be actually needed # BuildRequires: python3-pytest-xdist -Requires: python3-six %endif %if 0%{?with_doc} %if %{with python2} @@ -90,6 +88,7 @@ leading scientists and engineers. %package -n python2-scipy Summary: Scientific Tools for Python Requires: python2-numpy, python2-numpy-f2py +Requires: python2-six %{?python_provide:%python_provide python2-scipy} Obsoletes: scipy <= 0.16.0 %description -n python2-scipy @@ -129,6 +128,7 @@ Summary: Scientific Tools for Python Group: Development/Libraries License: BSD and LGPLv2+ Requires: python3-numpy, python3-f2py +Requires: python3-six %{?python_provide:%python_provide python3-scipy} %description -n python3-scipy Scipy is open-source software for mathematics, science, and @@ -286,9 +286,13 @@ popd %endif # with python3 %changelog -* Wed Apr 03 2019 Tomas Orsava - 1.0.0-19 -- Bumping due to problems with modular RPM upgrade path (#1695587) -- Related: rhbz#1693974 +* Tue Jun 04 2019 Nikola Forró - 1.0.0-20 +- Fix python{2,3}-six Requires +- Resolves: rhbz#1709599 + +* Thu Apr 25 2019 Tomas Orsava - 1.0.0-19 +- Bumping due to problems with modular RPM upgrade path +- Resolves: rhbz#1695587 * Thu Nov 15 2018 Nikola Forró - 1.0.0-18 - Unbundle six