From 5edf3c3fa7bf86f5a5153580d4ddd254fae6ca83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= Date: Tue, 19 Sep 2023 12:19:40 +0200 Subject: [PATCH] Stop enumerating the patches There was a gap between 1 and 3, which was not ideal. This way, we don't have to deal with the numbers. --- ...-Python-3.12-compatibility-in-check_console_script.patch | 0 ...e-Python-3.7-compatibility-in-check_console_script.patch | 0 ...sion.patch => Remove-commit-hash-from-Fish-version.patch | 0 python-argcomplete.spec | 6 +++--- 4 files changed, 3 insertions(+), 3 deletions(-) rename 0004-Ensure-Python-3.12-compatibility-in-check_console_script.patch => Ensure-Python-3.12-compatibility-in-check_console_script.patch (100%) rename 0003-Ensure-Python-3.7-compatibility-in-check_console_script.patch => Ensure-Python-3.7-compatibility-in-check_console_script.patch (100%) rename 0001-Remove-commit-hash-from-Fish-version.patch => Remove-commit-hash-from-Fish-version.patch (100%) diff --git a/0004-Ensure-Python-3.12-compatibility-in-check_console_script.patch b/Ensure-Python-3.12-compatibility-in-check_console_script.patch similarity index 100% rename from 0004-Ensure-Python-3.12-compatibility-in-check_console_script.patch rename to Ensure-Python-3.12-compatibility-in-check_console_script.patch diff --git a/0003-Ensure-Python-3.7-compatibility-in-check_console_script.patch b/Ensure-Python-3.7-compatibility-in-check_console_script.patch similarity index 100% rename from 0003-Ensure-Python-3.7-compatibility-in-check_console_script.patch rename to Ensure-Python-3.7-compatibility-in-check_console_script.patch diff --git a/0001-Remove-commit-hash-from-Fish-version.patch b/Remove-commit-hash-from-Fish-version.patch similarity index 100% rename from 0001-Remove-commit-hash-from-Fish-version.patch rename to Remove-commit-hash-from-Fish-version.patch diff --git a/python-argcomplete.spec b/python-argcomplete.spec index 40cff65..fd08d2c 100644 --- a/python-argcomplete.spec +++ b/python-argcomplete.spec @@ -15,17 +15,17 @@ Source0: %pypi_source argcomplete # Fish in Fedora contains git hash in version which breaks tests, # this patch removes it -Patch1: 0001-Remove-commit-hash-from-Fish-version.patch +Patch: Remove-commit-hash-from-Fish-version.patch # Ensure Python 3.7+ compatibility in check_console_script # Rebased from https://github.com/kislyuk/argcomplete/commit/f4d046c0ce # Partial fix for https://bugzilla.redhat.com/2231593 -Patch3: 0003-Ensure-Python-3.7-compatibility-in-check_console_script.patch +Patch: Ensure-Python-3.7-compatibility-in-check_console_script.patch # Ensure Python 3.12+ compatibility in check_console_script # Rebased from https://github.com/kislyuk/argcomplete/pull/448 # A second part of the fix for https://bugzilla.redhat.com/2231593 -Patch4: 0004-Ensure-Python-3.12-compatibility-in-check_console_script.patch +Patch: Ensure-Python-3.12-compatibility-in-check_console_script.patch BuildRequires: python3-devel BuildRequires: python3-setuptools