python-packaging: fix provides

SPECS/python-packaging/python-packaging.spec

@@ -2,7 +2,7 @@
 Summary:        Core utilities for Python packages
 Name:           python-packaging
 Version:        23.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        BSD OR ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -55,6 +55,9 @@ Core utilities for Python packages
 %license LICENSE
 
 %changelog
+* Thu Aug 29 2024 Andrew Phelps <anphel@microsoft.com> - 23.2-3
+- Bump release to rebuild and resolve python3dist provides issue
+
 * Fri Feb 16 2024 Andrew Phelps <anphel@microsoft.com> - 23.2-2
 - Disable debuginfo package to fix build with python 3.12
 

SPECS/python-pygments/python-pygments.spec

@@ -1,7 +1,7 @@
 Summary:        Pygments is a syntax highlighting package written in Python.
 Name:           python-pygments
 Version:        2.7.4
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -57,6 +57,9 @@ it is usable as a command-line tool and as a library.
 %{_bindir}/*
 
 %changelog
+* Thu Aug 29 2024 Andrew Phelps <anphel@microsoft.com> - 2.7.4-2
+- Bump release to rebuild and resolve python3dist provides issue
+
 * Wed Jul 10 2024 Muhammad Falak <mwani@microsoft.com> - 2.7.4-1
 - Upgrade to version 2.7.4 to address CVEs
 - Drop un-needed patches

SPECS/python-setuptools/python-setuptools.spec

@@ -6,7 +6,7 @@ Setuptools is a fully-featured, actively-maintained, and stable library designed
 Summary:        Easily build and distribute Python packages
 Name:           python-setuptools
 Version:        69.0.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -57,9 +57,13 @@ EOF
 %{python3_sitelib}/setuptools-%{version}.dist-info/*
 
 %changelog
+* Thu Aug 29 2024 Andrew Phelps <anphel@microsoft.com> - 69.0.3-3
+- Bump release to rebuild and resolve python3dist provides issue
+
 * Mon Mar 11 2024 Andrew Phelps <anphel@microsoft.com> - 69.0.3-2
 - Change Requires from python3-devel to python3
 - Add BuildRequires to fix regular package build
+
 * Tue Feb 13 2024 Andrew Phelps <anphel@microsoft.com> - 69.0.3-1
 - License verified
 - Original version for CBL-Mariner

toolkit/resources/manifests/package/pkggen_core_aarch64.txt

@@ -243,8 +243,8 @@ unzip-6.0-20.azl3.aarch64.rpm
 python3-3.12.3-2.azl3.aarch64.rpm
 python3-devel-3.12.3-2.azl3.aarch64.rpm
 python3-libs-3.12.3-2.azl3.aarch64.rpm
-python3-setuptools-69.0.3-2.azl3.noarch.rpm
-python3-pygments-2.7.4-1.azl3.noarch.rpm
+python3-setuptools-69.0.3-3.azl3.noarch.rpm
+python3-pygments-2.7.4-2.azl3.noarch.rpm
 which-2.21-8.azl3.aarch64.rpm
 libselinux-3.6-3.azl3.aarch64.rpm
 slang-2.3.3-1.azl3.aarch64.rpm
@@ -256,7 +256,7 @@ msopenjdk-17-17.0.12-1.aarch64.rpm
 pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
 pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
-python3-packaging-23.2-2.azl3.noarch.rpm
+python3-packaging-23.2-3.azl3.noarch.rpm
 audit-3.1.2-1.azl3.aarch64.rpm
 audit-libs-3.1.2-1.azl3.aarch64.rpm
 libxcrypt-4.4.36-2.azl3.aarch64.rpm

toolkit/resources/manifests/package/pkggen_core_x86_64.txt

@@ -243,8 +243,8 @@ unzip-6.0-20.azl3.x86_64.rpm
 python3-3.12.3-2.azl3.x86_64.rpm
 python3-devel-3.12.3-2.azl3.x86_64.rpm
 python3-libs-3.12.3-2.azl3.x86_64.rpm
-python3-setuptools-69.0.3-2.azl3.noarch.rpm
-python3-pygments-2.7.4-1.azl3.noarch.rpm
+python3-setuptools-69.0.3-3.azl3.noarch.rpm
+python3-pygments-2.7.4-2.azl3.noarch.rpm
 which-2.21-8.azl3.x86_64.rpm
 libselinux-3.6-3.azl3.x86_64.rpm
 slang-2.3.3-1.azl3.x86_64.rpm
@@ -256,7 +256,7 @@ msopenjdk-17-17.0.12-1.x86_64.rpm
 pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm
 pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
-python3-packaging-23.2-2.azl3.noarch.rpm
+python3-packaging-23.2-3.azl3.noarch.rpm
 audit-3.1.2-1.azl3.x86_64.rpm
 audit-libs-3.1.2-1.azl3.x86_64.rpm
 libxcrypt-4.4.36-2.azl3.x86_64.rpm

toolkit/resources/manifests/package/toolchain_aarch64.txt

@@ -546,12 +546,12 @@ python3-lxml-4.9.3-1.azl3.aarch64.rpm
 python3-magic-5.45-1.azl3.noarch.rpm
 python3-markupsafe-2.1.3-1.azl3.aarch64.rpm
 python3-newt-0.52.23-1.azl3.aarch64.rpm
-python3-packaging-23.2-2.azl3.noarch.rpm
+python3-packaging-23.2-3.azl3.noarch.rpm
 python3-pip-24.0-1.azl3.noarch.rpm
-python3-pygments-2.7.4-1.azl3.noarch.rpm
+python3-pygments-2.7.4-2.azl3.noarch.rpm
 python3-rpm-4.18.2-1.azl3.aarch64.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
-python3-setuptools-69.0.3-2.azl3.noarch.rpm
+python3-setuptools-69.0.3-3.azl3.noarch.rpm
 python3-test-3.12.3-2.azl3.aarch64.rpm
 python3-tools-3.12.3-2.azl3.aarch64.rpm
 python3-wheel-0.43.0-1.azl3.noarch.rpm

toolkit/resources/manifests/package/toolchain_x86_64.txt

@@ -552,12 +552,12 @@ python3-lxml-4.9.3-1.azl3.x86_64.rpm
 python3-magic-5.45-1.azl3.noarch.rpm
 python3-markupsafe-2.1.3-1.azl3.x86_64.rpm
 python3-newt-0.52.23-1.azl3.x86_64.rpm
-python3-packaging-23.2-2.azl3.noarch.rpm
+python3-packaging-23.2-3.azl3.noarch.rpm
 python3-pip-24.0-1.azl3.noarch.rpm
-python3-pygments-2.7.4-1.azl3.noarch.rpm
+python3-pygments-2.7.4-2.azl3.noarch.rpm
 python3-rpm-4.18.2-1.azl3.x86_64.rpm
 python3-rpm-generators-14-11.azl3.noarch.rpm
-python3-setuptools-69.0.3-2.azl3.noarch.rpm
+python3-setuptools-69.0.3-3.azl3.noarch.rpm
 python3-test-3.12.3-2.azl3.x86_64.rpm
 python3-tools-3.12.3-2.azl3.x86_64.rpm
 python3-wheel-0.43.0-1.azl3.noarch.rpm

toolkit/scripts/toolchain/build_official_toolchain_rpms.sh

@@ -587,6 +587,12 @@ build_rpm_in_chroot_no_install ocaml-srpm-macros
 
 build_rpm_in_chroot_no_install python-packaging
 chroot_and_install_rpms python-packaging python3-packaging
+# rebuild python-packaging to resolve circular dependency
+build_rpm_in_chroot_no_install python-packaging
+
+# Now that python-packaging is built, re-build pygments and setuptools to re-evaluate auto-generated provides
+build_rpm_in_chroot_no_install python-pygments
+build_rpm_in_chroot_no_install python-setuptools
 
 # python3-lxml requires python3-Cython and libxslt
 build_rpm_in_chroot_no_install Cython