.gitignore

@@ -1 +1 @@
-SOURCES/packaging-16.8.tar.gz
+SOURCES/packaging-19.2.tar.gz

.python-packaging.metadata

@@ -1 +1 @@
-68f9574b50683c0962ad90346879e7a2319cc6d8 SOURCES/packaging-16.8.tar.gz
+ae4aeb07c330d623c3d8fa8414c6080d2c9a4192 SOURCES/packaging-19.2.tar.gz

SPECS/python-packaging.spec

@@ -1,109 +1,70 @@
 %global pypi_name packaging
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+# Specify --without wheel to prevent building the wheel
-%global build_wheel 1
+%bcond_with wheel
-%global with_python3 1
-%endif
 
-%if 0%{?rhel} > 7
+# Specify --without docs to prevent the dependency loop on python-sphinx
-# Disable python2 build by default
+%bcond_with docs
-%bcond_with python2
-%else
-%bcond_without python2
-%endif
 
-%global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
+# Specify --without tests to prevent the dependency loop on python-pytest
-%global python3_wheelname %python2_wheelname
+%bcond_with tests
+
+%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
 
 Name:           python-%{pypi_name}
-Version:        16.8
+Version:        19.2
-Release:        9%{?dist}
+Release:        3%{?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
+# Exclude i686 arch. Due to a modularity issue it's being added to the
+# x86_64 compose of CRB, but we don't want to ship it at all.
+# See: https://projects.engineering.redhat.com/browse/RCM-72605
+ExcludeArch:    i686
 
-# Dependencies with different names in Fedora and Epel7
-%if %{with python2}
-%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires:  python2-setuptools
-BuildRequires:  python2-devel
-BuildRequires:  python2-pytest
-BuildRequires:  python2-pyparsing
-%else
-BuildRequires:  python-setuptools
-BuildRequires:  python-devel
-BuildRequires:  pytest
-BuildRequires:  pyparsing
-BuildRequires:  python-sphinx
-%endif
-
-BuildRequires:  python-pretend
-BuildRequires:  python-six
-%endif # with python2
-
-# Build Python 3 subpackage only for Fedora
-%if 0%{?with_python3}
 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}-rpm-macros
+%if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-pytest
+BuildRequires:  python%{python3_pkgversion}-pretend
+%endif
+%if %{with docs}
 BuildRequires:  python%{python3_pkgversion}-sphinx
 %endif
 
-%if 0%{?build_wheel}
+%if %{with wheel}
-%if %{with python2}
-BuildRequires:  python2-pip
-BuildRequires:  python2-wheel
-%endif # with python2
-%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-pip
 BuildRequires:  python%{python3_pkgversion}-wheel
 %endif
-%endif
 
 %description
 python-packaging provides core utilities for Python packages like utilities for
 dealing with versions, specifiers, markers etc.
 
-%if %{with python2}
-%package -n python2-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypi_name}}
-
-%if 0%{?fedora} || 0%{?rhel} > 7
-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.
-%endif # with python2
-
-%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{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
+%if %{with docs}
+%package -n python%{python3_pkgversion}-%{pypi_name}-doc
 Summary:        python-packaging documentation
-%description -n python-%{pypi_name}-doc
+
+%description -n python%{python3_pkgversion}-%{pypi_name}-doc
 Documentation for python-packaging
+%endif
 
 %prep
 %autosetup -n %{pypi_name}-%{version}
@@ -111,91 +72,92 @@ Documentation for python-packaging
 rm -rf %{pypi_name}.egg-info
 
 %build
-%if %{with python2}
+%if %{with wheel}
-%if 0%{?build_wheel}
-%py2_build_wheel
-%else
-%py2_build
-%endif
-%endif # with python2
-
-%if 0%{?with_python3}
-%if 0%{?build_wheel}
 %py3_build_wheel
 %else
 %py3_build
 %endif
-%endif
 
+%if %{with docs}
 # generate html docs
-%if 0%{?with_python3}
 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
 rm -rf html/_static/fonts/
+%endif
 
 %install
-%if %{with python2}
+%if %{with wheel}
-%if 0%{?build_wheel}
+%py3_install_wheel %{python_wheelname}
-%py2_install_wheel %{python2_wheelname}
-%else
-%py2_install
-%endif
-%endif # with python2
-
-%if 0%{?with_python3}
-%if 0%{?build_wheel}
-%py3_install_wheel %{python3_wheelname}
 %else
 %py3_install
 %endif
-%endif
 
+%if %{with tests}
 %check
-%if %{with python2}
-%if 0%{?fedora} || 0%{?rhel} > 7
-%{__python2} -m pytest tests/
-%else
-# Disable non-working tests in Epel7
-%{__python2} -m pytest --ignore=tests/test_requirements.py tests/
-%endif
-%endif # with python2
-
-%if 0%{?with_python3}
 %{__python3} -m pytest tests/
 %endif
 
-%if %{with python2}
-%files -n python2-%{pypi_name}
-%license LICENSE LICENSE.APACHE LICENSE.BSD
-%doc README.rst CHANGELOG.rst CONTRIBUTING.rst
-%{python2_sitelib}/%{pypi_name}/
-%{python2_sitelib}/%{pypi_name}-*-info/
-%endif # with python2
-
-%if 0%{?with_python3}
 %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}-*-info/
-%endif
 
-%files -n python-%{pypi_name}-doc
+%if %{with docs}
+%files -n python%{python3_pkgversion}-%{pypi_name}-doc
 %doc html
 %license LICENSE LICENSE.APACHE LICENSE.BSD
+%endif
 
 %changelog
-* Thu Jun 14 2018 Charalampos Stratakis <cstratak@redhat.com> - 16.8-9
+* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 19.2-3
-- Conditionalize the python2 subpackage
+- Exclude unsupported i686 arch
 
-* Tue May 22 2018 Petr Viktorin <pviktori@redhat.com> - 16.8-8
+* Tue Nov 19 2019 Lumír Balhar <lbalhar@redhat.com> - 19.2-2
-- Build the Python 3 subpackage also on EL>7
+- Adjusted for Python 3.8 module in RHEL 8
+
+* Thu Sep 26 2019 Lumír Balhar <lbalhar@redhat.com> - 19.2-1
+- New upstream version 19.2 (bz#1742388)
+
+* Mon Sep 23 2019 Lumír Balhar <lbalhar@redhat.com> - 19.0-6
+- Remove Python 2 subpackage
+- Make spec fedora-specific
+
+* Mon Sep 02 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-5
+- Reduce Python 2 build time dependencies
+
+* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-4
+- Rebuilt for Python 3.8
+
+* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-3
+- Bootstrap for Python 3.8
+
+* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Mon Feb 04 2019 Lumír Balhar <lbalhar@redhat.com> - 19.0-1
+- New upstream version
+
+* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 17.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 31 2018 Charalampos Stratakis <cstratak@redhat.com> - 17.1-1
+- Update to 17.1
+
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.8-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 16.8-10
+- Rebuilt for Python 3.7
+
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 16.8-9
+- Bootstrap for Python 3.7
+
+* Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 16.8-8
+- Update Python 2 dependency declarations to new packaging standards
+  (See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.8-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild