From aa0d7e420554c980699cb532cc97dd2c5c9a1331 Mon Sep 17 00:00:00 2001
From: jomae <jomae@af82e41b-90c4-0310-8c96-b1721e28e2e2>
Date: Sun, 27 Apr 2025 02:57:31 +0000
Subject: [PATCH] 1.6.1dev: adapt to distribution name normalization for wheel
 and sdist packages since setuptools 75.3.1 (closes #13881)

git-svn-id: http://trac.edgewall.org/intertrac/log:/branches/1.6-stable@17900 af82e41b-90c4-0310-8c96-b1721e28e2e2
---
 .github/release-upload.sh   | 2 +-
 .github/workflows/build.yml | 2 +-
 Makefile                    | 6 +++---
 requirements-release.txt    | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/release-upload.sh b/.github/release-upload.sh
index ed2e5917d..e51f7b657 100755
--- a/.github/release-upload.sh
+++ b/.github/release-upload.sh
@@ -10,7 +10,7 @@ if [ -n "$EDGEWALL_KEY_BASE64" ]; then
     echo "$EDGEWALL_HOST_KEY" >"$known_hosts"
     chmod 0600 "$keyfile"
     scp -i "$keyfile" -o "UserKnownHostsFile $known_hosts" \
-        dist/Trac-* github@edgewall.org:/var/ftp/pub/trac/incoming
+        dist/trac-* github@edgewall.org:/var/ftp/pub/trac/incoming
 else
     echo "::warning:: Skipped uploading package files to edgewall.org" 1>&2
 fi
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b5dcbe64b..9abba7a7b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -439,7 +439,7 @@ jobs:
       uses: actions/upload-artifact@v4
       with:
         name: release
-        path: dist/Trac-*
+        path: dist/trac-*
         if-no-files-found: ignore
 
     - name: Upload release packages to edgewall.org
diff --git a/Makefile b/Makefile
index 56d1c8b52..923d31f43 100644
--- a/Makefile
+++ b/Makefile
@@ -712,11 +712,11 @@ sdist:
 
 sdist+wheel = $(sdist_gztar) $(bdist_wheel)
 
-sdist_gztar = dist/Trac-$(version).tar.gz
-bdist_wheel = dist/Trac-$(version)-py3-none-any.whl
+sdist_gztar = dist/trac-$(version).tar.gz
+bdist_wheel = dist/trac-$(version)-py3-none-any.whl
 
 
-packages = $(wildcard $(sdist+wheel)
+packages = $(wildcard $(sdist+wheel))
 
 checksum:
 ifeq "$(version)" ""
diff --git a/requirements-release.txt b/requirements-release.txt
index d55029d17..a5d1b875f 100644
--- a/requirements-release.txt
+++ b/requirements-release.txt
@@ -1,5 +1,5 @@
 # Packages needed to create a release.
-setuptools
+setuptools>=75.3.1
 wheel
 jinja2
 babel