commit 4837c1e38cb334cc297d98dbe606f5a2796d9747
Author: Elan Ruusamäe <[email protected]>
Date: Mon Dec 12 12:03:42 2005 +0000
- leave /usr/sbin/{chsh,usermod} untouched
- fixed bcond killing when sorting BR
Changed files:
adapter.awk -> 1.227
adapter.awk | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index 1f1da21..2b84312 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -93,7 +93,7 @@ defattr == 1 {
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 @@ function use_macros()
continue;
if ($c ~ sbindir "/webapp")
continue;
+ if ($c ~ sbindir "/chsh")
+ continue;
+ if ($c ~ sbindir "/usermod")
+ continue;
gsub(sbindir, "%{_sbindir}", $c)
}
@@ -915,6 +919,10 @@ function use_macros()
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;
if ($c ~ prefix "/share/unsermake")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
