[rpms/python-django5] f44: Rebase setuptools patch and retarget to F43 and F44

[rpms/python-django5] f44: Rebase setuptools patch and retarget to F43 and F44

[Michel Lind]

            A new commit has been pushed.

            Repo   : rpms/python-django5
            Branch : f44
            Commit : bd1c5cf0b4f5e8cd67b3e996bf8b96566cf35ef6
            Author : Michel Lind <salimma@fedoraproject.org>
            Date   : 2026-09-09T12:49:53+01:00
            Stats  : +44/-30 in 4 file(s)
            URL    : https://src.fedoraproject.org/rpms/python-django5/c/bd1c5cf0b4f5e8cd67b3e996bf8b96566cf35ef6?branch=f44

            Log:
            Rebase setuptools patch and retarget to F43 and F44

Signed-off-by: Michel Lind <salimma@fedoraproject.org>

---
diff --git a/django-allow-setuptools-ge-69.diff b/django-allow-setuptools-ge-69.diff
deleted file mode 100644
index 9a1a04f..0000000
--- a/django-allow-setuptools-ge-69.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Revert relevant parts of 96a7a652166bece8acc96d6335ebb8091de2f496 so we can use older setuptools on F42
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -1,5 +1,5 @@
- [build-system]
--requires = ["setuptools>=77.0.3"]
-+requires = ["setuptools>=69.3"]
- build-backend = "setuptools.build_meta"
- 
- [project]
-@@ -16,13 +16,12 @@ authors = [
- ]
- description = "A high-level Python web framework that encourages rapid development and clean, pragmatic design."
- readme = "README.rst"
--license = "BSD-3-Clause"
--license-files = ["LICENSE", "LICENSE.python"]
- classifiers = [
-     "Development Status :: 5 - Production/Stable",
-     "Environment :: Web Environment",
-     "Framework :: Django",
-     "Intended Audience :: Developers",
-+    "License :: OSI Approved :: BSD License",
-     "Operating System :: OS Independent",
-     "Programming Language :: Python",
-     "Programming Language :: Python :: 3",

diff --git a/django-allow-setuptools-ge-77.diff b/django-allow-setuptools-ge-77.diff
new file mode 100644
index 0000000..b4cc5cd
--- /dev/null
+++ b/django-allow-setuptools-ge-77.diff
@@ -0,0 +1,38 @@
+From 705c4a5195a9b9dc36ecfe669f1ff880d5559c6d Mon Sep 17 00:00:00 2001
+From: Michel Lind <salimma@fedoraproject.org>
+Date: Wed, 9 Sep 2026 12:14:32 +0100
+Subject: [PATCH] Revert "[5.2.x] Bumped minimum setuptools version to 83."
+
+This reverts commit cd5ad8c81bf221868e3c33d90d6e021d067829b4.
+---
+ docs/intro/reusable-apps.txt | 2 +-
+ pyproject.toml               | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/docs/intro/reusable-apps.txt b/docs/intro/reusable-apps.txt
+index 2c6e962c08..6148b4e94b 100644
+--- a/docs/intro/reusable-apps.txt
++++ b/docs/intro/reusable-apps.txt
+@@ -209,7 +209,7 @@ this. For a small app like polls, this process isn't too difficult.
+        :caption: ``django-polls/pyproject.toml``
+ 
+        [build-system]
+-       requires = ["setuptools>83"]
++       requires = ["setuptools>=77.0.3"]
+        build-backend = "setuptools.build_meta"
+ 
+        [project]
+diff --git a/pyproject.toml b/pyproject.toml
+index 1d127812d0..59b3a52294 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -1,5 +1,5 @@
+ [build-system]
+-requires = ["setuptools>=83"]
++requires = ["setuptools>=77.0.3"]
+ build-backend = "setuptools.build_meta"
+ 
+ [project]
+-- 
+2.55.0
+

diff --git a/python-django5.spec b/python-django5.spec
index f5d525e..6322122 100644
--- a/python-django5.spec
+++ b/python-django5.spec
@@ -17,7 +17,7 @@
 %bcond all_tests 1
 %endif
 
-%if %{defined fedora} && 0%{?fedora} == 42
+%if %{defined fedora} && 0%{?fedora} <= 44
 %bcond old_setuptools 1
 %else
 %bcond old_setuptools 0
@@ -42,8 +42,9 @@ URL:            https://www.djangoproject.com/
 Source:         %{pypi_source django}
 Source:         %{name}.rpmlintrc
 
-# setuptools 77 is only needed to support the new license metadata
-Patch1001:      django-allow-setuptools-ge-69.diff
+# conditional patches: >= 1000
+# revert setuptools requirement back to 77.0.3 for F43/F44 compatibility
+Patch1001:      django-allow-setuptools-ge-77.diff
 
 BuildArch:      noarch
 

diff --git a/series b/series
index 30bef49..215fbfe 100644
--- a/series
+++ b/series
@@ -1,2 +1,2 @@
-django-py314-skip-failing-tests.diff
-django-allow-setuptools-ge-69.diff
+# django-py314-skip-failing-tests.diff
+django-allow-setuptools-ge-77.diff