- adapter %{_localedir}

Changed files:
    adapter.awk -> 1.510
    adapter.sh -> 1.49

diff --git a/adapter.awk b/adapter.awk
index 2945f11ebe444107b6beb344cb0a69fcdea37e37..fbce20497086b60ee9bc5805038f3108382a17d7 100644 (file)
--- 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 d41fa36cbd70da6e573f8238f4f3370d24ef42e2..44a4ee28f296a0d8370e89fb25bfe37bcf273ba4 100644 (file)
--- a/adapter.sh
+++ b/adapter.sh
@@ -195,6 +195,7 @@ import_rpm_macros() {
        _javadir
        _pkgconfigdir
        _npkgconfigdir
+       _localedir
 
        perl_sitearch
        perl_archlib