[packages/adapter: 333/631] - avoid %%{setup} loop - %patch -> %patch0

glen glen at pld-linux.org
Mon Sep 12 20:02:22 CEST 2016


commit af38fe16c37ac73724b680738109791d881ae976
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Wed Jul 26 19:15:30 2006 +0000

    - avoid %%{setup} loop
    - %patch -> %patch0
    
    Changed files:
        adapter.awk -> 1.321

 adapter.awk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index d17a225..a5ca007 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -318,7 +318,7 @@ function b_makekey(a, b,	s) {
 		sub(/^%setup/, "%setup -q")
 	}
 
-	if (/^%setup/) {
+	if (/^%setup/ && name != "setup") {
 		$0 = fixedsub(name, "%{name}", $0);
 		$0 = fixedsub(version, "%{version}", $0);
 		if (_beta) {
@@ -338,6 +338,7 @@ function b_makekey(a, b,	s) {
 	if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
 		$0 = fixedsub(" -n %{name}-%{version}", "", $0)
 	}
+    sub("^%patch ", "%patch0 ");
 
 	# invalid in %prep
 	sub("^rm -rf \$RPM_BUILD_ROOT.*", "");
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list