Author: glen Date: Sun Oct 9 16:32:10 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- don't touch %bcond lines
- leave /usr/share/file/magic.mime alone
- lave /usr/lib/sendmail intact
- don't touch --with-foo=/usr lines
---- Files affected:
SPECS:
adapter.awk (1.193 -> 1.194)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.193 SPECS/adapter.awk:1.194
--- SPECS/adapter.awk:1.193 Sun Oct 9 15:30:59 2005
+++ SPECS/adapter.awk Sun Oct 9 18:32:05 2005
@@ -112,6 +112,12 @@
next;
}
+/^%bcond_/ {
+ # do nothing
+ print
+ next
+}
+
preamble == 1 {
if (b_idx > 0) {
isort(b_key, b_idx);
@@ -807,6 +813,8 @@
continue;
if ($c ~ datadir "/unsermake")
continue;
+ if ($c ~ datadir "/file/magic.mime")
+ continue;
gsub(datadir, "%{_datadir}", $c)
}
@@ -840,14 +848,19 @@
gsub("/usr/lib/pkgconfig", "%{_libdir}/pkgconfig")
if (prefix != "/") {
- for (c = 1; c <= NF; c++) {
- if ($c ~ prefix "/sbin/fix-info-dir")
- continue;
- if ($c ~ prefix "/share/automake")
- continue;
- if ($c ~ prefix "/share/unsermake")
- continue;
- gsub(prefix, "%{_prefix}", $c)
+ # leave --with-foo=/usr alone
+ if ($0 !~ "--with.*=.*" prefix) {
+ for (c = 1; c <= NF; c++) {
+ if ($c ~ prefix "/sbin/fix-info-dir")
+ continue;
+ if ($c ~ prefix "/share/automake")
+ continue;
+ if ($c ~ prefix "/share/unsermake")
+ continue;
+ if ($c ~ prefix "/lib/sendmail")
+ continue;
+ gsub(prefix, "%{_prefix}", $c)
+ }
}
gsub("%{prefix}", "%{_prefix}")
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.193&r2=1.194&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
