packages: adapter.awk - add %_npkgconfigdir - avoid *.source being marked a...

[glen]

Author: glen                         Date: Thu Sep 16 21:55:08 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add %_npkgconfigdir
- avoid *.source being marked as executable

---- Files affected:
packages:
   adapter.awk (1.470 -> 1.471) 

---- Diffs:

================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.470 packages/adapter.awk:1.471
--- packages/adapter.awk:1.470  Thu Sep 16 23:36:32 2010
+++ packages/adapter.awk        Thu Sep 16 23:55:03 2010
@@ -1129,6 +1129,9 @@
        gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}")
        gsub(pkgconfigdir, "%{_pkgconfigdir}")
 
+       gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
+       gsub(npkgconfigdir, "%{_npkgconfigdir}")
+
        gsub(libdir, "%{_libdir}")
        gsub(javadir, "%{_javadir}")
 
@@ -1454,7 +1457,7 @@
                }
        }
 
-       if (/lib.+\.so/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
+       if (/lib.+\.so\b/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
                $0 = "%attr(755,root,root) " $0
        }
 
@@ -1788,7 +1791,7 @@
                exit(rc = 1);
        }
 
-       if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.44) 
{
+       if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.46) 
{
                print "adapter shell script is outdated, please cvs up it" > 
"/dev/stderr"
                do_not_touch_anything = 1
                exit(rc = 1);
@@ -1816,6 +1819,7 @@
        pixmapsdir = ENVIRON["_pixmapsdir"]
        javadir = ENVIRON["_javadir"]
        pkgconfigdir = ENVIRON["_pkgconfigdir"]
+       npkgconfigdir = ENVIRON["_npkgconfigdir"]
 
        perl_sitearch = ENVIRON["perl_sitearch"]
        perl_archlib = ENVIRON["perl_archlib"]
================================================================

---- CVS-web:
    
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.470&r2=1.471&f=u

_______________________________________________
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit