[rpms/python3.9] rawhide: Make the pip/setuptools version macros importpatches-compatible

[rpms/python3.9] rawhide: Make the pip/setuptools version macros importpatches-compatible

[@ 2026-07-02 14:03 UTC (permalink / raw)]

A new commit has been pushed.

Repo   : rpms/python3.9
Branch : rawhide
Commit : aee14b5c6b9f71b0eb831dfd0ff55cd875c3a6f9
Author : Miro Hrončok <miro@hroncok.cz>
Date   : 2026-07-02T11:06:29+02:00
Stats  : +7/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/python3.9/c/aee14b5c6b9f71b0eb831dfd0ff55cd875c3a6f9?branch=rawhide

Log:
Make the pip/setuptools version macros importpatches-compatible

---
diff --git a/python3.9.spec b/python3.9.spec
index 093f6e9..6416a4f 100644
--- a/python3.9.spec
+++ b/python3.9.spec
@@ -76,9 +76,7 @@ License: Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC A
 %endif
 
 # If the rpmwheels condition is disabled, we use the bundled wheel packages
-# from Python with the versions below.
-%global pip_version 23.0.1
-%global setuptools_version 79.0.1
+# from Python with the versions defined near patch 189.
 # All of those also include a list of indirect bundled libs:
 # pip
 #  $ %%{_rpmconfigdir}/pythonbundles.py <(unzip -p Lib/ensurepip/_bundled/pip-*.whl pip/_vendor/vendor.txt)
@@ -433,6 +431,12 @@ Patch111: 00111-no-static-lib.patch
 # Downstream only: upstream bundles
 # We might eventually pursuit upstream support, but it's low prio
 Patch189: 00189-use-rpm-wheels.patch
+# The following versions of setuptools/pip are bundled when this patch is not applied.
+# The versions are written in Lib/ensurepip/__init__.py, this patch removes them.
+# When the bundled setuptools/pip wheel is updated, the patch no longer applies cleanly.
+# In such cases, the patch needs to be amended and the versions updated here:
+%global pip_version 23.0.1
+%global setuptools_version 79.0.1
 
 # 00251 # 1b1047c14ff98eae6d355b4aac4df3e388813f62
 # Change user install location