From 62466386df807287fa7e47dfe5badb570931b3f1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Thu, 16 Sep 2010 21:55:03 +0000 Subject: [PATCH] - 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"] -- 2.44.0