.gitignore

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

.python-packaging.metadata

@@ -1 +1 @@
-68f9574b50683c0962ad90346879e7a2319cc6d8 SOURCES/packaging-16.8.tar.gz
+8243804fa28da44825ee89ea4c78298d34adf00e SOURCES/packaging-20.9.tar.gz

SPECS/python-packaging.spec

@@ -1,204 +1,237 @@
+# 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
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+# Specify --with bootstrap to build in bootstrap mode
-%global build_wheel 1
+# This mode is needed, because python3-rpm-generators need packaging
-%global with_python3 1
+# When bootstrapping, disable tests and docs as well.
-%endif
+%bcond_with bootstrap
+
+%if %{without bootstrap}
+# Specify --without docs to prevent the dependency loop on python-sphinx
+%bcond_without docs
 
-%if 0%{?rhel} > 7
-# Disable python2 build by default
-%bcond_with python2
 %else
-%bcond_without python2
+%bcond_with docs
 %endif
 
-%global python2_wheelname %{pypi_name}-%{version}-py2.py3-none-any.whl
-%global python3_wheelname %python2_wheelname
-
 Name:           python-%{pypi_name}
-Version:        16.8
+Version:        20.9
-Release:        9%{?dist}
+Release:        5%{?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
+Source0:        %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
 BuildArch:      noarch
 
-# Dependencies with different names in Fedora and Epel7
+BuildRequires:  python%{python3_pkgversion}-devel
-%if %{with python2}
+BuildRequires:  pyproject-rpm-macros
-%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 %{with bootstrap}
-%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-devel
+%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
-BuildRequires:  python%{python3_pkgversion}-pyparsing
+%endif
-BuildRequires:  python%{python3_pkgversion}-six
+%if %{with docs}
 BuildRequires:  python%{python3_pkgversion}-sphinx
 %endif
 
-%if 0%{?build_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
+%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.}
-
-%if %{with python2}
-%package -n python2-%{pypi_name}
-Summary:        %{summary}
-%{?python_provide:%python_provide python2-%{pypi_name}}
 
-%if 0%{?fedora} || 0%{?rhel} > 7
+%description %_description
-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}}
+
- 
+# This is kept for compatibility with Fedora < 33 only:
-Requires:       python%{python3_pkgversion}-pyparsing
+%py_provides    python%{python3_pkgversion}-%{pypi_name}
-Requires:       python%{python3_pkgversion}-six
+
-%description -n python%{python3_pkgversion}-%{pypi_name}
+%if %{with bootstrap}
-python3-packaging provides core utilities for Python packages like utilities for
+Provides:       python%{python3_pkgversion}dist(packaging) = %{version}
-dealing with versions, specifiers, markers etc.
+Provides:       python%{python3_version}dist(packaging) = %{version}
+Requires:       python%{python3_version}dist(pyparsing)
 %endif
 
+%description -n python%{python3_pkgversion}-%{pypi_name}  %_description
+
+
+%if %{with docs}
 %package -n python-%{pypi_name}-doc
 Summary:        python-packaging documentation
+
 %description -n python-%{pypi_name}-doc
 Documentation for python-packaging
+%endif
+
 
 %prep
-%autosetup -n %{pypi_name}-%{version}
+%autosetup -p1 -n %{pypi_name}-%{version}
-# Remove bundled egg-info
-rm -rf %{pypi_name}.egg-info
 
-%build
+# Do not use furo as HTML theme in docs
-%if %{with python2}
+# furo is not available in Fedora
-%if 0%{?build_wheel}
+sed -i '/html_theme = "furo"/d' docs/conf.py
-%py2_build_wheel
+
-%else
+%if %{without bootstrap}
-%py2_build
+%generate_buildrequires
+%pyproject_buildrequires -r
 %endif
-%endif # with python2
 
-%if 0%{?with_python3}
+
-%if 0%{?build_wheel}
+%build
-%py3_build_wheel
+%if %{with bootstrap}
-%else
 %py3_build
-%endif
+%else
+%pyproject_wheel
 %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 bootstrap}
-%if 0%{?build_wheel}
+%py3_install
-%py2_install_wheel %{python2_wheelname}
+echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
 %else
-%py2_install
+%pyproject_install
+%pyproject_save_files %{pypi_name}
 %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}
+%pytest
-%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 python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
-%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
 
+%if %{with docs}
 %files -n python-%{pypi_name}-doc
 %doc html
 %license LICENSE LICENSE.APACHE LICENSE.BSD
+%endif
+
 
 %changelog
-* Thu Dec 07 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 16.8-9
+* Tue Feb 08 2022 Tomas Orsava <torsava@redhat.com> - 20.9-5
-- Rebuilt for MSVSphere 8.8
+- 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
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Mon Jun 01 2020 Lumír Balhar <lbalhar@redhat.com> - 20.4-1
+- Update to 20.4 (#1838285)
+
+* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-3
+- Rebuilt for Python 3.9
+
+* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-2
+- Bootstrap for Python 3.9
+
+* Fri Mar 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.3-1
+- Update to 20.3 (#1810738)
+
+* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Jan 27 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1-1
+- Update to 20.1 (#1794865)
+
+* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-2
+- Ignore broken tests
+
+* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-1
+- Update to 20.0 (#1788012)
+
+* 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 Charalampos Stratakis <cstratak@redhat.com> - 16.8-9
+* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 16.8-9
-- Conditionalize the python2 subpackage
+- Bootstrap for Python 3.7
 
-* Tue May 22 2018 Petr Viktorin <pviktori@redhat.com> - 16.8-8
+* Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 16.8-8
-- Build the Python 3 subpackage also on EL>7
+- 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