SPECS: adapter.awk - avoid %%{setup} loop - %patch -> %patch0

[glen]

Author: glen                         Date: Wed Jul 26 19:15:35 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- avoid %%{setup} loop
- %patch -> %patch0

---- Files affected:
SPECS:
   adapter.awk (1.320 -> 1.321) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.320 SPECS/adapter.awk:1.321
--- SPECS/adapter.awk:1.320	Wed Jul 26 17:39:21 2006
+++ SPECS/adapter.awk	Wed Jul 26 21:15:30 2006
@@ -318,7 +318,7 @@
 		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 @@
 	if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
 		$0 = fixedsub(" -n %{name}-%{version}", "", $0)
 	}
+    sub("^%patch ", "%patch0 ");
 
 	# invalid in %prep
 	sub("^rm -rf \$RPM_BUILD_ROOT.*", "");
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.320&r2=1.321&f=u