[packages/adapter] - 1.518, convert patch stanzas to rpm 4.18+ format

baggins baggins at pld-linux.org
Sun Dec 8 22:47:25 CET 2024


commit b822db088af13851d1556d675257c407da503310
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 8 22:44:56 2024 +0100

    - 1.518, convert patch stanzas to rpm 4.18+ format

 adapter.awk  | 5 ++++-
 adapter.spec | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/adapter.spec b/adapter.spec
index 44886a5..8f457f5 100644
--- a/adapter.spec
+++ b/adapter.spec
@@ -1,7 +1,7 @@
 Summary:	Adapt RPM .spec files to PLD Linux coding standard
 Summary(pl.UTF-8):	Adaptowanie plików .spec pakietów RPM do standardu kodowania PLD Linuksa
 Name:		adapter
-Version:	1.517
+Version:	1.518
 Release:	1
 License:	GPL
 Group:		Applications/File
diff --git a/adapter.awk b/adapter.awk
index 5877d1c..3f4be5b 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -372,13 +372,16 @@ function b_makekey(a, b,	s) {
 	if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
 		$0 = fixedsub(" -n %{name}-%{version}", "", $0)
 	}
-	sub("^%patch ", "%patch0 ")
 
 	# fedora extras
 	if (/^%apply/) {
 		sub("^%apply -n", "%patch")
 	}
 
+	if (/^%patch[0-9]+/) {
+		sub("[0-9]+", " -P &")
+	}
+
 	# invalid in %prep
 	sub("^rm -rf \\$RPM_BUILD_ROOT.*", "")
 }
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/b822db088af13851d1556d675257c407da503310



More information about the pld-cvs-commit mailing list