# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1283378843 -7200
# Node ID e8d6420a4212ee02fbfce13a2fd0650b055f90e6
# Parent  46ee28dc714535cfa70196a69eed67e2d52d28a3
integrate compare-locales into build to merge missing translations with en-US

diff -r 46ee28dc7145 -r e8d6420a4212 mozilla-xulrunner20/create-tar.sh
--- a/mozilla-xulrunner20/create-tar.sh	Wed Sep 01 10:56:36 2010 +0200
+++ b/mozilla-xulrunner20/create-tar.sh	Thu Sep 02 00:07:23 2010 +0200
@@ -25,3 +25,7 @@
 done
 tar cjf l10n-$VERSION.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
 
+# compare-locales
+hg clone http://hg.mozilla.org/build/compare-locales
+tar cjf compare-locales.tar.bz2 --exclude=.hgtags --exclude=.hgignore --exclude=.hg compare-locales
+
diff -r 46ee28dc7145 -r e8d6420a4212 mozilla-xulrunner20/mozilla-xulrunner20.spec
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Wed Sep 01 10:56:36 2010 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Thu Sep 02 00:07:23 2010 +0200
@@ -56,6 +56,7 @@
 Source6:        create-tar.sh
 Source7:        baselibs.conf
 Source8:        toolkit-lockdown.js
+Source9:        compare-locales.tar.bz2
 Patch1:         toolkit-download-folder.patch
 Patch2:         mozilla-pkgconfig.patch
 Patch3:         idldir.patch
@@ -195,7 +196,7 @@
 %endif
 
 %prep
-%setup -n mozilla -q -b 1
+%setup -n mozilla -q -b 1 -b 9
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -345,6 +346,12 @@
    ja-JP-mac|en-US)
       ;;
    *)
+      pushd $RPM_BUILD_DIR/compare-locales
+      PYTHONPATH=lib \
+        scripts/compare-locales -m ../l10n-merged/$locale \
+	../mozilla/toolkit/locales/l10n.ini ../l10n $locale
+      popd
+      LOCALE_MERGEDIR=../l10n-merged \
       make -C toolkit/locales libs-$locale
       cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
          $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/chrome