[packages/adapter: 502/631] - add %_npkgconfigdir - avoid *.source being marked as executable

[glen]

commit 1c298a134e5d201f9e732ac4da92857d651b67f7
Author: Elan Ruusamäe <glen at pld-linux.org>
Date:   Thu Sep 16 21:55:03 2010 +0000

    - add %_npkgconfigdir
    - avoid *.source being marked as executable
    
    Changed files:
        adapter.awk -> 1.471

 adapter.awk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/adapter.awk b/adapter.awk
index b6dbfd3..1068884 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1129,6 +1129,9 @@ function use_macros()
 	gsub("%{_libdir}/pkgconfig", "%{_pkgconfigdir}")
 	gsub(pkgconfigdir, "%{_pkgconfigdir}")
 
+	gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
+	gsub(npkgconfigdir, "%{_npkgconfigdir}")
+
 	gsub(libdir, "%{_libdir}")
 	gsub(javadir, "%{_javadir}")
 
@@ -1454,7 +1457,7 @@ function use_files_macros(	i, n, t, a, l)
 		}
 	}
 
-	if (/lib.+\.so/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
+	if (/lib.+\.so\b/ && !/\.so$/ && !/^%attr.*/ && !/%exclude/) {
 		$0 = "%attr(755,root,root) " $0
 	}
 
@@ -1788,7 +1791,7 @@ function import_rpm_macros() {
 		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 @@ function import_rpm_macros() {
 	pixmapsdir = ENVIRON["_pixmapsdir"]
 	javadir = ENVIRON["_javadir"]
 	pkgconfigdir = ENVIRON["_pkgconfigdir"]
+	npkgconfigdir = ENVIRON["_npkgconfigdir"]
 
 	perl_sitearch = ENVIRON["perl_sitearch"]
 	perl_archlib = ENVIRON["perl_archlib"]
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885