From 24ba7a4d3b704a8361b8678f22a20d3ca3595bf7 Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Wed, 22 Mar 2017 12:19:41 +0100
Subject: [PATCH] Epel7 compatible specfile/package.

---
 python-packaging.spec | 81 ++++++++++++++++++++++++++++++++-----------
 1 file changed, 60 insertions(+), 21 deletions(-)

diff --git a/python-packaging.spec b/python-packaging.spec
index 411df4f..0a9d309 100644
--- a/python-packaging.spec
+++ b/python-packaging.spec
@@ -2,28 +2,41 @@
 
 Name:           python-%{pypi_name}
 Version:        16.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Core utilities for Python packages
 
 License:        BSD or ASL 2.0
 URL:            https://github.com/pypa/packaging
 Source0:        https://files.pythonhosted.org/packages/source/p/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
- 
+
+# Dependencies with different names in Fedora and Epel7
+%if 0%{?fedora}
 BuildRequires:  python2-setuptools
 BuildRequires:  python2-devel
 BuildRequires:  python2-pytest
-BuildRequires:  python-pretend
 BuildRequires:  python2-pyparsing
+%else
+BuildRequires:  python-setuptools
+BuildRequires:  python-devel
+BuildRequires:  pytest
+BuildRequires:  pyparsing
+BuildRequires:  python-sphinx
+%endif
+
+BuildRequires:  python-pretend
 BuildRequires:  python-six
- 
-BuildRequires:  python3-setuptools
-BuildRequires:  python3-devel
-BuildRequires:  python3-pytest
-BuildRequires:  python3-pretend
-BuildRequires:  python3-pyparsing
-BuildRequires:  python3-six
-BuildRequires:  python3-sphinx
+
+# Build Python 3 subpackage only for Fedora
+%if 0%{?fedora}
+BuildRequires:  python%{python3_pkgversion}-setuptools
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-pretend
+BuildRequires:  python%{python3_pkgversion}-pyparsing
+BuildRequires:  python%{python3_pkgversion}-six
+BuildRequires:  python%{python3_pkgversion}-sphinx
+%endif
 
 %description
 python-packaging provides core utilities for Python packages like utilities for
@@ -32,27 +45,33 @@ dealing with versions, specifiers, markers etc.
 %package -n python2-%{pypi_name}
 Summary:        %{summary}
 %{?python_provide:%python_provide python2-%{pypi_name}}
- 
+
+%if 0%{?fedora}
 Requires:       python2-pyparsing
+%else
+Requires:       pyparsing
+%endif
+
 Requires:       python-six
+
 %description -n python2-%{pypi_name}
 python2-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
 
-
-%package -n python3-%{pypi_name}
+%if 0%{?fedora}
+%package -n python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python3-%{pypi_name}}
+%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
  
-Requires:       python3-pyparsing
-Requires:       python3-six
-%description -n python3-%{pypi_name}
+Requires:       python%{python3_pkgversion}-pyparsing
+Requires:       python%{python3_pkgversion}-six
+%description -n python%{python3_pkgversion}-%{pypi_name}
 python3-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
+%endif
 
 %package -n python-%{pypi_name}-doc
 Summary:        python-packaging documentation
-Suggests:       python3-%{pypi_name} = %{version}-%{release}
 %description -n python-%{pypi_name}-doc
 Documentation for python-packaging
 
@@ -63,9 +82,17 @@ rm -rf %{pypi_name}.egg-info
 
 %build
 %py2_build
+%if 0%{?fedora}
 %py3_build
-# generate html docs 
+%endif
+
+# generate html docs
+%if 0%{?fedora}
 sphinx-build-3 docs html
+%else
+sphinx-build docs html
+%endif
+
 # remove the sphinx-build leftovers
 rm -rf html/.{doctrees,buildinfo}
 # Do not bundle fonts
@@ -73,11 +100,18 @@ rm -rf html/_static/fonts/
 
 %install
 %py2_install
+%if 0%{?fedora}
 %py3_install
+%endif
 
 %check
+%if 0%{?fedora}
 %{__python2} -m pytest tests/
 %{__python3} -m pytest tests/
+%else
+# Disable non-working tests in Epel7
+%{__python2} -m pytest --ignore=tests/test_requirements.py tests/
+%endif
 
 %files -n python2-%{pypi_name}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
@@ -85,17 +119,22 @@ rm -rf html/_static/fonts/
 %{python2_sitelib}/%{pypi_name}/
 %{python2_sitelib}/%{pypi_name}-%{version}-py%{python2_version}.egg-info
 
-%files -n python3-%{pypi_name}
+%if 0%{?fedora}
+%files -n python%{python3_pkgversion}-%{pypi_name}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
 %{python3_sitelib}/%{pypi_name}/
 %{python3_sitelib}/%{pypi_name}-%{version}-py%{python3_version}.egg-info
+%endif
 
 %files -n python-%{pypi_name}-doc
 %doc html
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 
 %changelog
+* Wed Mar 22 2017 Lumir Balhar <lbalhar@redhat.com> - 16.8-2
+- Epel7 compatible spec/package
+
 * Wed Nov 02 2016 Lumir Balhar <lbalhar@redhat.com> - 16.8-1
 - New upstream version