Author: glen Date: Sun Feb 5 20:16:52 2012 GMT
Module: packages Tag: HEAD
---- Log message:
- adapter %{_localedir}
---- Files affected:
packages:
adapter (1.48 -> 1.49) , adapter.awk (1.509 -> 1.510)
---- Diffs:
================================================================
Index: packages/adapter
diff -u packages/adapter:1.48 packages/adapter:1.49
--- packages/adapter:1.48 Sun Feb 5 13:15:53 2012
+++ packages/adapter Sun Feb 5 21:16:47 2012
@@ -195,6 +195,7 @@
_javadir
_pkgconfigdir
_npkgconfigdir
+ _localedir
perl_sitearch
perl_archlib
================================================================
Index: packages/adapter.awk
diff -u packages/adapter.awk:1.509 packages/adapter.awk:1.510
--- packages/adapter.awk:1.509 Sun Feb 5 13:15:53 2012
+++ packages/adapter.awk Sun Feb 5 21:16:47 2012
@@ -1197,6 +1197,9 @@
gsub("%{_datadir}/pkgconfig", "%{_npkgconfigdir}")
gsub(npkgconfigdir, "%{_npkgconfigdir}")
+ gsub("%{_datadir}/locale", "%{_localedir}")
+ gsub(localedir, "%{_localedir}")
+
gsub(libdir, "%{_libdir}")
gsub(javadir, "%{_javadir}")
@@ -1900,7 +1903,7 @@
}
# 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 @@
javadir = ENVIRON["_javadir"]
pkgconfigdir = ENVIRON["_pkgconfigdir"]
npkgconfigdir = ENVIRON["_npkgconfigdir"]
+ localedir = ENVIRON["_localedir"]
perl_sitearch = ENVIRON["perl_sitearch"]
perl_archlib = ENVIRON["perl_archlib"]
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter?r1=1.48&r2=1.49&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/adapter.awk?r1=1.509&r2=1.510&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
