commit 4efeac87ad9b64cb9543ef11f16a212217278f49
Author: Elan Ruusamäe <[email protected]>
Date: Sun Feb 5 20:16:47 2012 +0000
- adapter %{_localedir}
Changed files:
adapter.awk -> 1.510
adapter.sh -> 1.49
adapter.awk | 6 +++++-
adapter.sh | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
---
diff --git a/adapter.awk b/adapter.awk
index 2945f11..fbce204 100644
--- a/adapter.awk
+++ b/adapter.awk
@@ -1197,6 +1197,9 @@ function use_macros()
gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
gsub(npkgconfigdir, "%{_npkgconfigdir}")
+ gsub("%{_datadir}/locale", "%{_localedir}")
+ gsub(localedir, "%{_localedir}")
+
gsub(libdir, "%{_libdir}")
gsub(javadir, "%{_javadir}")
@@ -1900,7 +1903,7 @@ function import_rpm_macros() {
}
# update this version dep each time some new macro export is added
- if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.47)
{
+ if (!ENVIRON["ADAPTER_REVISION"] || ENVIRON["ADAPTER_REVISION"] < 1.49)
{
print "adapter shell script is outdated, please cvs up it" >
"/dev/stderr"
do_not_touch_anything = 1
exit(rc = 1);
@@ -1929,6 +1932,7 @@ function import_rpm_macros() {
javadir = ENVIRON["_javadir"]
pkgconfigdir = ENVIRON["_pkgconfigdir"]
npkgconfigdir = ENVIRON["_npkgconfigdir"]
+ localedir = ENVIRON["_localedir"]
perl_sitearch = ENVIRON["perl_sitearch"]
perl_archlib = ENVIRON["perl_archlib"]
diff --git a/adapter.sh b/adapter.sh
index d41fa36..44a4ee2 100755
--- a/adapter.sh
+++ b/adapter.sh
@@ -195,6 +195,7 @@ import_rpm_macros() {
_javadir
_pkgconfigdir
_npkgconfigdir
+ _localedir
perl_sitearch
perl_archlib
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/adapter.git/commitdiff/6ca0126d4d0c8c79feb7db10b0a0fade0f3b8885
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
