[packages/rpm] replace %patchN with %patch -P to fix build with itself

atler atler at pld-linux.org
Tue Nov 26 22:02:41 CET 2024


commit 99d89b449dd633d1aa085316b8b4075c12fc3c59
Author: Jan Palus <atler at pld-linux.org>
Date:   Tue Nov 26 21:46:14 2024 +0100

    replace %patchN with %patch -P to fix build with itself
    
    4.18 deprecated %patchN:
    https://github.com/rpm-software-management/rpm/commit/eb5ece1267a22330f6116149997cf5cc1c22b21f
    
    4.20 dropped it:
    https://github.com/rpm-software-management/rpm/commit/afd352481bacea521ce5ba01e989866478278532

 rpm.spec | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)
---
diff --git a/rpm.spec b/rpm.spec
index c3d0e16..f7b7d15 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -620,33 +620,33 @@ Dokumentacja API RPM-a oraz przewodniki w formacie HTML generowane ze
 
 %prep
 %setup -q -n %{name}-%{version}%{?subver}
-%patch0 -p1
-%patch3 -p1
-%patch4 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
-%patch21 -p1
-%patch22 -p1
-%patch23 -p1
-%patch24 -p1
-%patch25 -p1
-%patch26 -p1
-%patch27 -p1
-%patch28 -p1
-%patch29 -p1
-%patch30 -p1
+%patch -P 0 -p1
+%patch -P 3 -p1
+%patch -P 4 -p1
+%patch -P 6 -p1
+%patch -P 7 -p1
+%patch -P 8 -p1
+%patch -P 9 -p1
+%patch -P 10 -p1
+%patch -P 11 -p1
+%patch -P 12 -p1
+%patch -P 13 -p1
+%patch -P 15 -p1
+%patch -P 16 -p1
+%patch -P 17 -p1
+%patch -P 18 -p1
+%patch -P 19 -p1
+%patch -P 20 -p1
+%patch -P 21 -p1
+%patch -P 22 -p1
+%patch -P 23 -p1
+%patch -P 24 -p1
+%patch -P 25 -p1
+%patch -P 26 -p1
+%patch -P 27 -p1
+%patch -P 28 -p1
+%patch -P 29 -p1
+%patch -P 30 -p1
 
 # generate Group translations to *.po
 awk -f %{SOURCE6} %{SOURCE5}
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/rpm.git/commitdiff/99d89b449dd633d1aa085316b8b4075c12fc3c59



More information about the pld-cvs-commit mailing list