From d0e32d9246847d7e77d3ce8a4a46ab32556934e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Mon, 2 Dec 2024 19:24:52 +0100 Subject: [PATCH] CI: Rename in-tree patches to make them nicer in a single directory --- ...rect-for-wer.patch => python-httpbin-werkzeug-2.1.patch} | 0 tests/python-httpbin.spec | 2 +- ...ls-59.6.0-remove-optional-or-unpackaged-test-deps.patch} | 0 ...ls-67.7.2-remove-optional-or-unpackaged-test-deps.patch} | 0 tests/python-setuptools.spec | 6 +----- 5 files changed, 2 insertions(+), 6 deletions(-) rename tests/{0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch => python-httpbin-werkzeug-2.1.patch} (100%) rename tests/{0001-Remove-optional-or-unpackaged-test-deps.patch => python-setuptools-59.6.0-remove-optional-or-unpackaged-test-deps.patch} (100%) rename tests/{Remove-optional-or-unpackaged-test-deps.patch => python-setuptools-67.7.2-remove-optional-or-unpackaged-test-deps.patch} (100%) diff --git a/tests/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch b/tests/python-httpbin-werkzeug-2.1.patch similarity index 100% rename from tests/0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch rename to tests/python-httpbin-werkzeug-2.1.patch diff --git a/tests/python-httpbin.spec b/tests/python-httpbin.spec index 72e1165..7e7a49e 100644 --- a/tests/python-httpbin.spec +++ b/tests/python-httpbin.spec @@ -12,7 +12,7 @@ BuildRequires: pyproject-rpm-macros %if 0%{?rhel} != 9 # Wekrzeug in Fedora and EL10+ isn't compatible with our httpbin -Patch: 0001-Fix-disabling-of-location-header-autocorrect-for-wer.patch +Patch: python-httpbin-werkzeug-2.1.patch %endif # no flask, itsdangerous, raven, werkzeug packaged for EPEL 9 yet diff --git a/tests/0001-Remove-optional-or-unpackaged-test-deps.patch b/tests/python-setuptools-59.6.0-remove-optional-or-unpackaged-test-deps.patch similarity index 100% rename from tests/0001-Remove-optional-or-unpackaged-test-deps.patch rename to tests/python-setuptools-59.6.0-remove-optional-or-unpackaged-test-deps.patch diff --git a/tests/Remove-optional-or-unpackaged-test-deps.patch b/tests/python-setuptools-67.7.2-remove-optional-or-unpackaged-test-deps.patch similarity index 100% rename from tests/Remove-optional-or-unpackaged-test-deps.patch rename to tests/python-setuptools-67.7.2-remove-optional-or-unpackaged-test-deps.patch diff --git a/tests/python-setuptools.spec b/tests/python-setuptools.spec index 307fbf7..fbc554b 100644 --- a/tests/python-setuptools.spec +++ b/tests/python-setuptools.spec @@ -14,11 +14,7 @@ URL: https://pypi.python.org/pypi/setuptools Source: %{pypi_source setuptools %{version}} # Patch from Fedora proper -%if 0%{?rhel} != 9 -Patch: Remove-optional-or-unpackaged-test-deps.patch -%else -Patch: 0001-Remove-optional-or-unpackaged-test-deps.patch -%endif +Patch: python-setuptools-%{version}-remove-optional-or-unpackaged-test-deps.patch BuildArch: noarch