From bac27b622726d2a526b3fbcae2732db269ee723b Mon Sep 17 00:00:00 2001 From: Carl George Date: Thu, 12 Oct 2017 16:08:28 -0500 Subject: [PATCH] Add EPEL compatibility --- python-click.spec | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/python-click.spec b/python-click.spec index ad110f0..eefa004 100644 --- a/python-click.spec +++ b/python-click.spec @@ -2,7 +2,7 @@ Name: python-%{pypi_name} Version: 6.7 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Simple wrapper around optparse for powerful command line utilities License: BSD @@ -15,7 +15,7 @@ Patch1: 0002-Add-pytest-option-to-not-capture-warnings.patch Patch2: 0003-Catch-and-test-pytest-warning.patch BuildArch: noarch - + %global _description \ click is a Python package for creating beautiful command line\ interfaces in a composable way with as little amount of code as necessary.\ @@ -28,21 +28,24 @@ comes with good defaults out of the box. Summary: %{summary} %{?python_provide:%python_provide python2-%{pypi_name}} BuildRequires: python2-devel -BuildRequires: python2-setuptools -BuildRequires: python2-pytest +BuildRequires: python%{?fedora:2}-setuptools +%if %{undefined rhel} +# pytest in base RHEL is too old, we'll skip the tests there +BuildRequires: python2-pytest >= 2.8 +%endif %description -n python2-%{pypi_name} %{_description} Python 2 version. -%package -n python3-%{pypi_name} +%package -n python%{python3_pkgversion}-%{pypi_name} Summary: %{summary} -%{?python_provide:%python_provide python3-%{pypi_name}} -BuildRequires: python3-devel -BuildRequires: python3-setuptools -BuildRequires: python3-pytest +%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}} +BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-setuptools +BuildRequires: python%{python3_pkgversion}-pytest >= 2.8 -%description -n python3-%{pypi_name} %{_description} +%description -n python%{python3_pkgversion}-%{pypi_name} %{_description} Python 3 version. @@ -59,8 +62,11 @@ Python 3 version. %check export PYTHONPATH=$(pwd) -export LC_ALL=C.UTF-8 +export LC_ALL=en_US.UTF-8 +%if %{undefined rhel} +# pytest in base RHEL is too old, we'll skip the tests there py.test-%{python2_version} tests --tb=long --verbose +%endif py.test-%{python3_version} tests --tb=long --verbose %files -n python2-%{pypi_name} @@ -69,13 +75,16 @@ py.test-%{python3_version} tests --tb=long --verbose %{python2_sitelib}/%{pypi_name}-*.egg-info/ %{python2_sitelib}/%{pypi_name}/ -%files -n python3-%{pypi_name} +%files -n python%{python3_pkgversion}-%{pypi_name} %license LICENSE %doc README CHANGES %{python3_sitelib}/%{pypi_name}-*.egg-info/ %{python3_sitelib}/%{pypi_name}/ %changelog +* Thu Oct 12 2017 Carl George - 6.7-6 +- Add EPEL compatibility + * Thu Oct 12 2017 Igor Gnatenko - 6.7-5 - Fix FTBFS