From ae9e722247c7cd3183035e1713580bd8f8742dec4288fa50fb73a4f2cfbcac38 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Fri, 23 Feb 2024 13:28:08 +0000 Subject: [PATCH] Accepting request 1149874 from home:pgajdos:m - Use %patch -P N instead of deprecated %patchN. OBS-URL: https://build.opensuse.org/request/show/1149874 OBS-URL: https://build.opensuse.org/package/show/server:database/mariadb?expand=0&rev=318 --- mariadb.changes | 5 +++++ mariadb.spec | 14 +++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/mariadb.changes b/mariadb.changes index cffbb5d..6fa63e5 100644 --- a/mariadb.changes +++ b/mariadb.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Feb 23 11:14:44 UTC 2024 - pgajdos@suse.com + +- Use %patch -P N instead of deprecated %patchN. + ------------------------------------------------------------------- Wed Feb 14 10:40:40 UTC 2024 - Danilo Spinella diff --git a/mariadb.spec b/mariadb.spec index 1fb373f..5e2a934 100644 --- a/mariadb.spec +++ b/mariadb.spec @@ -353,20 +353,20 @@ PAM module. %setup -q # Remove JAR files from the tarball (used for testing from the source) find . -name "*.jar" -type f -exec rm --verbose -f {} \; -%patch1 -%patch4 -%patch6 -p1 -%patch7 -p1 +%patch -P 1 +%patch -P 4 +%patch -P 6 -p1 +%patch -P 7 -p1 %if 0%{?suse_version} > 1500 %ifarch s390x ppc64 ppc64le -%patch9 +%patch -P 9 %endif %endif # usrmerge has only been applied to TW %if 0%{?suse_version} > 1500 -%patch10 -p1 +%patch -P 10 -p1 %endif -%patch11 -p1 +%patch -P 11 -p1 cp %{_sourcedir}/suse-test-run .