SPECS: adapter.awk - leave /usr/sbin/{chsh, usermod} untouched - fi...

[glen]

Author: glen                         Date: Mon Dec 12 12:03:48 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- leave /usr/sbin/{chsh,usermod} untouched
- fixed bcond killing when sorting BR

---- Files affected:
SPECS:
   adapter.awk (1.226 -> 1.227) 

---- Diffs:

================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.226 SPECS/adapter.awk:1.227
--- SPECS/adapter.awk:1.226	Sun Dec 11 17:28:39 2005
+++ SPECS/adapter.awk	Mon Dec 12 13:03:42 2005
@@ -93,7 +93,7 @@
 function b_makekey(a, b,	s) {
 	s = a "" b;
 	# kill bcond
-	gsub("%{\\?[_a-zA-Z0-9]+:", "", s);
+	gsub(/%{[!?]+[_a-zA-Z0-9]+:/, "", s);
 	return s;
 }
 
@@ -831,6 +831,10 @@
 			continue;
 		if ($c ~ sbindir "/webapp")
 			continue;
+		if ($c ~ sbindir "/chsh")
+			continue;
+		if ($c ~ sbindir "/usermod")
+			continue;
 		gsub(sbindir, "%{_sbindir}", $c)
 	}
 
@@ -914,6 +918,10 @@
 				if ($c ~ prefix "/sbin/fix-info-dir")
 					continue;
 				if ($c ~ prefix "/sbin/webapp")
+					continue;
+				if ($c ~ prefix "/sbin/chsh")
+					continue;
+				if ($c ~ prefix "/sbin/usermod")
 					continue;
 				if ($c ~ prefix "/share/automake")
 					continue;
================================================================

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