From fa4faae679209baa758d0b8f523b9d8c6cc85fc3 Mon Sep 17 00:00:00 2001 From: Iryna Shcherbina Date: Dec 11 2017 11:26:05 +0000 Subject: Fix ambiguous Python 2 dependency declarations --- diff --git a/numpy.spec b/numpy.spec index 9e32544..d29bf6e 100644 --- a/numpy.spec +++ b/numpy.spec @@ -11,7 +11,7 @@ Name: numpy Version: 1.13.3 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Summary: A fast multidimensional array facility for Python @@ -22,7 +22,7 @@ URL: http://www.numpy.org/ Source0: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz Source1: https://docs.scipy.org/doc/numpy/numpy-html-1.13.0.zip -BuildRequires: python2-devel lapack-devel python-setuptools gcc-gfortran python-nose +BuildRequires: python2-devel lapack-devel python2-setuptools gcc-gfortran python2-nose BuildRequires: Cython %ifarch %{openblas_arches} BuildRequires: openblas-devel @@ -46,7 +46,7 @@ this package is a version of f2py that works properly with NumPy. %package -n python2-numpy Summary: A fast multidimensional array facility for Python -Requires: python-nose +Requires: python2-nose %{?python_provide:%python_provide python2-%{modname}} # General provides of plain 'numpy' that is in use by 1 package as of F24 Provides: numpy = %{epoch}:%{version}-%{release} @@ -69,7 +69,7 @@ this package is a version of f2py that works properly with NumPy. Summary: f2py for numpy Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} -Requires: python-devel +Requires: python2-devel Provides: f2py = %{epoch}:%{version}-%{release} Provides: numpy-f2py = %{epoch}:%{version}-%{release} Obsoletes: numpy-f2py < 1:1.10.1-3 @@ -321,6 +321,10 @@ popd &> /dev/null %changelog +* Mon Dec 11 2017 Iryna Shcherbina - 1:1.13.3-5 +- Fix ambiguous Python 2 dependency declarations + (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3) + * Mon Nov 06 2017 Merlin Mathesius - 1:1.13.3-3 - Cleanup spec file conditionals