.gitignore

@@ -1 +1 @@
-SOURCES/packaging-20.4.tar.gz
+SOURCES/packaging-20.9.tar.gz

.python-packaging.metadata

@@ -1 +1 @@
-b99fa7af153646722b2d1817bb09906cc5a94bc6 SOURCES/packaging-20.4.tar.gz
+8243804fa28da44825ee89ea4c78298d34adf00e SOURCES/packaging-20.9.tar.gz

SOURCES/39a70cce.patch

@@ -1,51 +0,0 @@
-From 39a70cce69d9b08cc4d02b225114d556d5b59ada Mon Sep 17 00:00:00 2001
-From: Hugo van Kemenade <hugovk@users.noreply.github.com>
-Date: Wed, 19 Aug 2020 22:37:34 +0300
-Subject: [PATCH] Remove dependency on six to make package lighter (#331)
-
----
- packaging/requirements.py | 8 +++++++-
- setup.py                  | 2 +-
- 2 files changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/packaging/requirements.py b/packaging/requirements.py
-index 91f81ed..2226e98 100644
---- a/packaging/requirements.py
-+++ b/packaging/requirements.py
-@@ -5,16 +5,22 @@
- 
- import string
- import re
-+import sys
- 
- from pyparsing import stringStart, stringEnd, originalTextFor, ParseException
- from pyparsing import ZeroOrMore, Word, Optional, Regex, Combine
- from pyparsing import Literal as L  # noqa
--from six.moves.urllib import parse as urlparse
- 
- from ._typing import TYPE_CHECKING
- from .markers import MARKER_EXPR, Marker
- from .specifiers import LegacySpecifier, Specifier, SpecifierSet
- 
-+if sys.version_info[0] >= 3:
-+    from urllib import parse as urlparse  # pragma: no cover
-+else:  # pragma: no cover
-+    import urlparse
-+
-+
- if TYPE_CHECKING:  # pragma: no cover
-     from typing import List
- 
-diff --git a/setup.py b/setup.py
-index f533a7d..a14d926 100644
---- a/setup.py
-+++ b/setup.py
-@@ -49,7 +49,7 @@
-     author=about["__author__"],
-     author_email=about["__email__"],
-     python_requires=">=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*",
--    install_requires=["pyparsing>=2.0.2", "six"],  # Needed to avoid issue #91
-+    install_requires=["pyparsing>=2.0.2"],  # Needed to avoid issue #91
-     classifiers=[
-         "Development Status :: 5 - Production/Stable",
-         "Intended Audience :: Developers",

SPECS/python-packaging.spec

@@ -1,36 +1,40 @@
+# Tests are disabled to remove the test dependencies
+# Specify --with tests to run the tests on e.g. EPEL
+%bcond_with tests
+
 %global pypi_name packaging
 
-# Specify --without docs to prevent the dependency loop on python-sphinx
-# RHEL: Disabled due to missing deps
-%bcond_with docs
+# Specify --with bootstrap to build in bootstrap mode
+# This mode is needed, because python3-rpm-generators need packaging
+# When bootstrapping, disable tests and docs as well.
+%bcond_with bootstrap
 
-# Specify --without tests to prevent the dependency loop on python-pytest
-# RHEL: Disabled due to missing deps
-%bcond_with tests
+%if %{without bootstrap}
+# Specify --without docs to prevent the dependency loop on python-sphinx
+%bcond_without docs
 
-%global python_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
+%else
+%bcond_with docs
+%endif
 
 Name:           python-%{pypi_name}
-Version:        20.4
-Release:        4%{?dist}
+Version:        20.9
+Release:        5%{?dist}
 Summary:        Core utilities for Python packages
 
 License:        BSD or ASL 2.0
 URL:            https://github.com/pypa/packaging
-Source0:        %{pypi_source}
+Source0:        %{url}/archive/%{version}/%{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
 
-# Remove dependency on six to make package lighter, backported from upstream
-Patch1:         %{url}/commit/39a70cce.patch
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  pyproject-rpm-macros
 
+%if %{with bootstrap}
 BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-devel
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
-BuildRequires:  python%{python3_pkgversion}-pyparsing
+%endif
+
+# Upstream uses nox for testing, we specify the test deps manually as well.
 %if %{with tests}
 BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-pretend
@@ -39,38 +43,57 @@ BuildRequires:  python%{python3_pkgversion}-pretend
 BuildRequires:  python%{python3_pkgversion}-sphinx
 %endif
 
-BuildRequires:  python%{python3_pkgversion}-pip
-BuildRequires:  python%{python3_pkgversion}-wheel
 
-%description
+%global _description %{expand:
 python-packaging provides core utilities for Python packages like utilities for
-dealing with versions, specifiers, markers etc.
+dealing with versions, specifiers, markers etc.}
+
+%description %_description
+
 
 %package -n python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
-%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
 
-Requires:       python%{python3_pkgversion}-pyparsing
+# This is kept for compatibility with Fedora < 33 only:
+%py_provides    python%{python3_pkgversion}-%{pypi_name}
+
+%if %{with bootstrap}
+Provides:       python%{python3_pkgversion}dist(packaging) = %{version}
+Provides:       python%{python3_version}dist(packaging) = %{version}
+Requires:       python%{python3_version}dist(pyparsing)
+%endif
+
+%description -n python%{python3_pkgversion}-%{pypi_name}  %_description
 
-%description -n python%{python3_pkgversion}-%{pypi_name}
-python%{python3_pkgversion}-packaging provides core utilities for Python packages like utilities for
-dealing with versions, specifiers, markers etc.
 
 %if %{with docs}
-%package -n python%{python3_pkgversion}-%{pypi_name}-doc
+%package -n python-%{pypi_name}-doc
 Summary:        python-packaging documentation
 
-%description -n python%{python3_pkgversion}-%{pypi_name}-doc
+%description -n python-%{pypi_name}-doc
 Documentation for python-packaging
 %endif
 
+
 %prep
 %autosetup -p1 -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
+
+# Do not use furo as HTML theme in docs
+# furo is not available in Fedora
+sed -i '/html_theme = "furo"/d' docs/conf.py
+
+%if %{without bootstrap}
+%generate_buildrequires
+%pyproject_buildrequires -r
+%endif
+
 
 %build
-%py3_build_wheel
+%if %{with bootstrap}
+%py3_build
+%else
+%pyproject_wheel
+%endif
 
 %if %{with docs}
 # generate html docs
@@ -81,30 +104,63 @@ rm -rf html/.{doctrees,buildinfo}
 rm -rf html/_static/fonts/
 %endif
 
+
 %install
-%py3_install_wheel %{python_wheelname}
+%if %{with bootstrap}
+%py3_install
+echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
+%else
+%pyproject_install
+%pyproject_save_files %{pypi_name}
+%endif
+
 
 %if %{with tests}
 %check
 %pytest
 %endif
 
-%files -n python%{python3_pkgversion}-%{pypi_name}
+
+%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %doc README.rst CHANGELOG.rst CONTRIBUTING.rst
-%{python3_sitelib}/%{pypi_name}/
-%{python3_sitelib}/%{pypi_name}-*-info/
+
 
 %if %{with docs}
-%files -n python%{python3_pkgversion}-%{pypi_name}-doc
+%files -n python-%{pypi_name}-doc
 %doc html
 %license LICENSE LICENSE.APACHE LICENSE.BSD
 %endif
 
+
 %changelog
-* Tue Jan 12 2021 Tomas Orsava <torsava@redhat.com> - 20.4-4
-- Convert from Fedora to the python39 module in RHEL8
-- Resolves: rhbz#1877430
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 20.9-5
+- Add automatically generated Obsoletes tag with the python39- prefix
+  for smoother upgrade from RHEL8
+- Related: rhbz#1990421
+
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
+
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Mon Mar 08 2021 Charalampos Stratakis <cstratak@redhat.com> - 20.9-2
+- Disable tests on RHEL9 to remove the test dependencies
+
+* Mon Feb 01 2021 Lumír Balhar <lbalhar@redhat.com> - 20.9-1
+- Update to 20.9
+Resolves: rhbz#1922545
+
+* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.8-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Mon Dec 14 2020 Lumír Balhar <lbalhar@redhat.com> - 20.8-1
+- Update to 20.8 (#1906985)
+
+* Mon Nov 30 2020 Lumír Balhar <lbalhar@redhat.com> - 20.7-1
+- Update to 20.7 (#1902369)
 
 * Fri Oct 02 2020 Miro Hrončok <mhroncok@redhat.com> - 20.4-3
 - Drop the dependency on six to make the package lighter