.gitignore

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

.python-packaging.metadata

@@ -1 +1 @@
-4a150d7127c64e5be67db5f6cbce3601e505113e SOURCES/packaging-23.2.tar.gz
+8243804fa28da44825ee89ea4c78298d34adf00e SOURCES/packaging-20.9.tar.gz

SPECS/python-packaging.spec

@@ -1,40 +1,37 @@
+# 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 --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
 
-# When bootstrapping, the tests and docs are disabled because the dependencies are not yet available.
-# We don't want python-pretend in future RHEL, so we disable tests on RHEL as well.
-# No reason to ship the documentation in RHEL either, so it is also disabled by default.
-%if %{without bootstrap} && %{undefined rhel}
+%if %{without bootstrap}
 # Specify --without docs to prevent the dependency loop on python-sphinx
 %bcond_without docs
 
-# Specify --without tests to prevent the dependency loop on python-pytest
-%bcond_without tests
 %else
 %bcond_with docs
-%bcond_with tests
 %endif
 
 Name:           python-%{pypi_name}
-Version:        23.2
-Release:        6%{?dist}
+Version:        20.9
+Release:        5%{?dist}
 Summary:        Core utilities for Python packages
 
-License:        BSD-2-Clause OR Apache-2.0
+License:        BSD or ASL 2.0
 URL:            https://github.com/pypa/packaging
 Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
-
 BuildArch:      noarch
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  pyproject-rpm-macros
-BuildRequires:  unzip
 
 %if %{with bootstrap}
-BuildRequires:  python%{python3_pkgversion}-flit-core
+BuildRequires:  python%{python3_pkgversion}-setuptools
 %endif
 
 # Upstream uses nox for testing, we specify the test deps manually as well.
@@ -44,7 +41,6 @@ BuildRequires:  python%{python3_pkgversion}-pretend
 %endif
 %if %{with docs}
 BuildRequires:  python%{python3_pkgversion}-sphinx
-BuildRequires:  python%{python3_pkgversion}-furo
 %endif
 
 
@@ -58,10 +54,13 @@ dealing with versions, specifiers, markers etc.}
 %package -n python%{python3_pkgversion}-%{pypi_name}
 Summary:        %{summary}
 
+# 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(abi) = %{python3_version}
+Requires:       python%{python3_version}dist(pyparsing)
 %endif
 
 %description -n python%{python3_pkgversion}-%{pypi_name}  %_description
@@ -79,6 +78,9 @@ Documentation for python-packaging
 %prep
 %autosetup -p1 -n %{pypi_name}-%{version}
 
+# 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
@@ -88,7 +90,7 @@ Documentation for python-packaging
 
 %build
 %if %{with bootstrap}
-%{python3} -m flit_core.wheel
+%py3_build
 %else
 %pyproject_wheel
 %endif
@@ -105,8 +107,7 @@ rm -rf html/_static/fonts/
 
 %install
 %if %{with bootstrap}
-mkdir -p %{buildroot}%{python3_sitelib}
-unzip dist/packaging-%{version}-py3-none-any.whl -d %{buildroot}%{python3_sitelib} -x packaging-%{version}.dist-info/RECORD
+%py3_install
 echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
 %else
 %pyproject_install
@@ -114,9 +115,8 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
 %endif
 
 
-%check
-%{!?with_bootstrap:%pyproject_check_import}
 %if %{with tests}
+%check
 %pytest
 %endif
 
@@ -134,86 +134,20 @@ echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
 
 
 %changelog
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 23.2-6
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 23.2-5
-- Bump release for June 2024 mass rebuild
-
-* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.2-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Mon Oct 09 2023 Miro Hrončok <mhroncok@redhat.com> - 23.2-2
-- Use the furo Sphinx theme, as intended upstream
-
-* Mon Oct 02 2023 Lumír Balhar <lbalhar@redhat.com> - 23.2-1
-- Update to 23.2 (rhbz#2241653)
-
-* Tue Aug 08 2023 Karolina Surma <ksurma@redhat.com> - 23.1-5
-- Declare the license as an SPDX expression
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 16 2023 Python Maint <python-maint@redhat.com> - 23.1-3
-- Rebuilt for Python 3.12
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 23.1-2
-- Bootstrap for Python 3.12
-
-* Mon Apr 17 2023 Lumír Balhar <lbalhar@redhat.com> - 23.1-1
-- Update to 23.1 (rhbz#2186423)
-
-* Fri Feb 03 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 23.0-1
-- Update to 23.0.0
-- https://fedoraproject.org/wiki/Changes/Update_python-packaging_to_version_22_plus
-- Fixes: rhbz#2151743
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 21.3-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Tue Aug 23 2022 Miro Hrončok <mhroncok@redhat.com> - 21.3-7
-- Fix tests on Big Endian builders
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 21.3-5
-- Rebuilt for pyparsing-3.0.9
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.3-4
-- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.3-3
-- Bootstrap for Python 3.11
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Nov 18 2021 Lumír Balhar <lbalhar@redhat.com> - 21.3-1
-- Update to 21.3
-Resolves: rhbz#2024413
-
-* Mon Nov 01 2021 Lumír Balhar <lbalhar@redhat.com> - 21.2-1
-- Update to 21.2
-Resolves: rhbz#2018534
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+* 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
 
-* Wed Jul 07 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
-- Update to 21.0
-Resolves: rhbz#1978925
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 20.9-3
-- Rebuilt for Python 3.10
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com>
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
 
-* Tue Jun 01 2021 Python Maint <python-maint@redhat.com> - 20.9-2
-- Bootstrap for Python 3.10
+* 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