SOURCES/Adjust-the-setup.py-install-deprecation-message.patch

@@ -1,41 +0,0 @@
-From 58f33f0aef5b137287e6f425b922a03123735a77 Mon Sep 17 00:00:00 2001
-From: Lumir Balhar <lbalhar@redhat.com>
-Date: Wed, 20 Sep 2023 17:18:47 +0200
-Subject: [PATCH] Adjust the setup.py install deprecation message and URL
-
-But only when building RPM packages.
----
- setuptools/command/install.py | 10 ++++++++--
- 1 file changed, 8 insertions(+), 2 deletions(-)
-
-diff --git a/setuptools/command/install.py b/setuptools/command/install.py
-index 606cce9..0af1631 100644
---- a/setuptools/command/install.py
-+++ b/setuptools/command/install.py
-@@ -1,6 +1,7 @@
- from distutils.errors import DistutilsArgError
- import inspect
- import glob
-+import os
- import platform
- import distutils.command.install as orig
- 
-@@ -40,8 +41,13 @@ class install(orig.install):
-             Please avoid running ``setup.py`` directly.
-             Instead, use pypa/build, pypa/installer or other
-             standards-based tools.
--            """,
--            see_url="https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html",
-+            """
-+            + ("""
-+            Follow the current Python packaging guidelines when building
-+            Python RPM packages.
-+            """ if "RPM_BUILD_ROOT" in os.environ else ""),
-+            see_url=("https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html" +
-+            ("\nand https://docs.fedoraproject.org/en-US/packaging-guidelines/Python/" if "RPM_BUILD_ROOT" in os.environ else "")),
-             # TODO: Document how to bootstrap setuptools without install
-             #       (e.g. by unziping the wheel file)
-             #       and then add a due_date to this warning.
--- 
-2.41.0
-

SPECS/python3.12-setuptools.spec

@@ -3,6 +3,11 @@
 
 %global srcname setuptools
 
+# Workaround for https://issues.redhat.com/browse/CS-1907
+# By defining the %%{__bootstrap} value,
+# we prevent misconfigured Koji putting a literal %%{__bootstrap} in %%dist.
+%{!?__bootstrap:%global __bootstrap %{nil}}
+
 # used when bootstrapping new Python versions
 %bcond_with bootstrap
 
@@ -38,10 +43,6 @@ License:        MIT and ASL 2.0 and (BSD or ASL 2.0) and Python
 URL:            https://pypi.python.org/pypi/%{srcname}
 Source0:        %{pypi_source %{srcname} %{version}}
 
-# The `setup.py install` deprecation notice might be confusing for RPM packagers
-# adjust it, but only when $RPM_BUILD_ROOT is set
-Patch:          Adjust-the-setup.py-install-deprecation-message.patch
-
 # Security fix for CVE-2024-6345
 # Remote code execution via download functions in the package_index module
 # Tracking bug: https://bugzilla.redhat.com/show_bug.cgi?id=2297771
@@ -228,7 +229,7 @@ PYTHONPATH=$(pwd) %pytest \
 %changelog
 * Wed Jul 24 2024 Lumír Balhar <lbalhar@redhat.com> - 68.2.2-4
 - Security fix for CVE-2024-6345
-Resolves: RHEL-49985
+Resolves: RHEL-50475
 
 * Tue Jan 23 2024 Miro Hrončok <mhroncok@redhat.com> - 68.2.2-3
 - Rebuilt for timestamp .pyc invalidation mode