SPECS: adapter.awk - use fixedsub for %setup macros usage (to prev...

glen glen at pld-linux.org
Tue Dec 13 15:11:17 CET 2005


Author: glen                         Date: Tue Dec 13 14:11:17 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use fixedsub for %setup macros usage (to prevent "%{ver}.%{ver2}" match "%{ver}-%{ver2}")

---- Files affected:
SPECS:
   adapter.awk (1.235 -> 1.236) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.235 SPECS/adapter.awk:1.236
--- SPECS/adapter.awk:1.235	Tue Dec 13 14:58:29 2005
+++ SPECS/adapter.awk	Tue Dec 13 15:11:12 2005
@@ -273,21 +273,21 @@
 	}
 
 	if (/^%setup/) {
-		gsub(name, "%{name}");
-		gsub(version, "%{version}");
+		$0 = fixedsub(name, "%{name}", $0);
+		$0 = fixedsub(version, "%{version}", $0);
 		if (_beta) {
-			gsub(_beta, "%{_beta}");
+			$0 = fixedsub(_beta, "%{_beta}", $0);
 		}
 		if (_rc) {
-			gsub(_rc, "%{_rc}");
+			$0 = fixedsub(_rc, "%{_rc}", $0);
 		}
 		if (_snap) {
-			gsub(_snap, "%{_snap}");
+			$0 = fixedsub(_snap, "%{_snap}", $0);
 		}
 	}
 
 	if (/^%setup/ && /-n %{name}-%{version}( |$)/) {
-		sub(/ -n %{name}-%{version}/, "")
+		$0 = fixedsub(" -n %{name}-%{version}", "", $0)
 	}
 
 	# invalid in %prep
================================================================

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




More information about the pld-cvs-commit mailing list