Update Python 2 dependency declarations to new packaging standards

This commit is contained in:
Iryna Shcherbina 2018-03-13 21:17:52 +01:00
parent b50d6e2dfa
commit fbfa33d124
1 changed files with 10 additions and 6 deletions

View File

@ -1,6 +1,6 @@
Name: netcdf4-python Name: netcdf4-python
Version: 1.2.9 Version: 1.2.9
Release: 4%{?dist} Release: 5%{?dist}
Summary: Python/numpy interface to netCDF Summary: Python/numpy interface to netCDF
Group: Development/Languages Group: Development/Languages
@ -16,13 +16,13 @@ Patch1: netcdf4-python-libs.patch
BuildRequires: python2-devel BuildRequires: python2-devel
BuildRequires: python2-setuptools >= 18.0 BuildRequires: python2-setuptools >= 18.0
BuildRequires: Cython BuildRequires: python2-Cython
BuildRequires: python-dateutil BuildRequires: python2-dateutil
# EL6 has python 2.6 and needs ordereddict # EL6 has python 2.6 and needs ordereddict
%if 0%{?rhel} && 0%{?rhel} <= 6 %if 0%{?rhel} && 0%{?rhel} <= 6
BuildRequires: python-ordereddict BuildRequires: python-ordereddict
%endif %endif
BuildRequires: numpy BuildRequires: python2-numpy
BuildRequires: python%{python3_pkgversion}-devel BuildRequires: python%{python3_pkgversion}-devel
BuildRequires: python%{python3_pkgversion}-Cython BuildRequires: python%{python3_pkgversion}-Cython
BuildRequires: python%{python3_pkgversion}-dateutil BuildRequires: python%{python3_pkgversion}-dateutil
@ -57,8 +57,8 @@ Group: Development/Languages
%if 0%{?rhel} && 0%{?rhel} <= 6 %if 0%{?rhel} && 0%{?rhel} <= 6
Requires: python-ordereddict Requires: python-ordereddict
%endif %endif
Requires: Cython Requires: python2-Cython
Requires: numpy Requires: python2-numpy
%{?python_provide:%python_provide python2-netcdf4} %{?python_provide:%python_provide python2-netcdf4}
Provides: netcdf4-python2 = %{version}-%{release} Provides: netcdf4-python2 = %{version}-%{release}
@ -149,6 +149,10 @@ PYTHONPATH=$(echo ../build/lib.*%{python3_version}) %{__python3} run_all.py
%changelog %changelog
* Tue Mar 13 2018 Iryna Shcherbina <ishcherb@redhat.com> - 1.2.9-5
- Update Python 2 dependency declarations to new packaging standards
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-4 * Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.9-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild