Author: glen Date: Tue Dec 13 14:37:15 2005 GMT
Module: SPECS Tag: HEAD
---- Log message:
- leave -I/usr/include alone
- cvs up rpm.groups only when inexistent (less cvs traffic and rarely updated
file)
---- Files affected:
SPECS:
adapter.awk (1.236 -> 1.237)
---- Diffs:
================================================================
Index: SPECS/adapter.awk
diff -u SPECS/adapter.awk:1.236 SPECS/adapter.awk:1.237
--- SPECS/adapter.awk:1.236 Tue Dec 13 15:11:12 2005
+++ SPECS/adapter.awk Tue Dec 13 15:37:10 2005
@@ -44,7 +44,7 @@
# File with rpm groups
"rpm --eval %_sourcedir" | getline groups_file
groups_file = groups_file "/rpm.groups"
- system("cd `rpm --eval %_sourcedir`; cvs up rpm.groups >/dev/null")
+ system("cd `rpm --eval %_sourcedir`; [ -f rpm.groups ] || cvs up
rpm.groups >/dev/null")
# Temporary file for changelog section
changelog_file = ENVIRON["HOME"] "/tmp/adapter.changelog"
@@ -902,14 +902,20 @@
if (prefix"/share" == datadir)
gsub("%{_prefix}/share", "%{_datadir}")
- gsub(includedir, "%{_includedir}")
+ # CFLAGS="-I/usr/include/ncurses is usually correct.
+ if (!/-I\/usr\/include/) {
+ gsub(includedir, "%{_includedir}")
+ }
+
gsub("%{prefix}/include", "%{_includedir}")
- if (prefix"/include" == includedir)
+ if (prefix"/include" == includedir) {
gsub("%{_prefix}/include", "%{_includedir}")
+ }
gsub(mandir, "%{_mandir}")
- if ($0 !~ "%{_datadir}/manual")
+ if ($0 !~ "%{_datadir}/manual") {
gsub("%{_datadir}/man", "%{_mandir}")
+ }
gsub("%{_prefix}/share/man", "%{_mandir}")
gsub("%{prefix}/share/man", "%{_mandir}")
gsub("%{prefix}/man", "%{_mandir}")
@@ -945,6 +951,11 @@
continue;
if ($c ~ prefix "/lib/pkgconfig")
continue;
+
+ # CFLAGS="-I/usr/include/ncurses is usually
correct.
+ if (/-I\/usr\/include/)
+ continue;
+
gsub(prefix, "%{_prefix}", $c)
}
}
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/adapter.awk?r1=1.236&r2=1.237&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
