From da055d65492864fa7bb03aac99da69b2f03354aa Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Tue, 21 Sep 2010 16:46:19 +0200
Subject: [PATCH] Enabled langpacks

---
 firefox.sh.in |  9 +++++----
 firefox.spec  | 18 ++----------------
 2 files changed, 7 insertions(+), 20 deletions(-)

diff --git a/firefox.sh.in b/firefox.sh.in
index 53e1c92..f2da268 100644
--- a/firefox.sh.in
+++ b/firefox.sh.in
@@ -192,9 +192,10 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
     # So that pt-BR doesn't try to use pt for example
     SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
     MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
+    MANIFEST="chrome.manifest"
 
     # Try to link global langpacks to an extension directory
-    if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
+    if [ -f $MOZ_LANGPACKS_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
         if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org ]; then
             rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1
         fi 
@@ -203,7 +204,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
                   $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org
             echo "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org" > $FEDORA_LANGPACK_CONFIG
         fi
-    elif [ -f $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then
+    elif [ -f $MOZ_LANGPACKS_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
         if [ -d $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org ]; then
             rmdir "$MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org" > /dev/null 2>&1
         fi 
@@ -215,10 +216,10 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
     fi
 
     # And set it up for mozilla
-    if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/chrome/$SHORTMOZLOCALE.jar ]; then
+    if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${SHORTMOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
         MOZARGS="-UILocale $SHORTMOZLOCALE"
     else
-        if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/chrome/$MOZLOCALE.jar ]; then
+        if [ -f $MOZ_EXTENSIONS_PROFILE_DIR/langpack-${MOZLOCALE}@firefox.mozilla.org/$MANIFEST ]; then
             MOZARGS="-UILocale $MOZLOCALE"
         fi
     fi
diff --git a/firefox.spec b/firefox.spec
index 4de4066..821f71b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -16,7 +16,7 @@
 %define xulrunner_version_max   2.1
 
 %define official_branding       0
-%define build_langpacks         0
+%define build_langpacks         1
 %define include_debuginfo       0
 
 %if ! %{official_branding}
@@ -265,21 +265,8 @@ for langpack in `ls firefox-langpacks/*.xpi`; do
   unzip $langpack -d $extensiondir
   find $extensiondir -type f | xargs chmod 644
 
-  tmpdir=`mktemp -d %{name}.XXXXXXXX`
-  langtmp=$tmpdir/%{name}/langpack-$language
-  %{__mkdir_p} $langtmp
-  jarfile=$extensiondir/chrome/$language.jar
-  unzip $jarfile -d $langtmp
-
   sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{homepage}|g;" \
-         $langtmp/locale/browser-region/region.properties
-
-  find $langtmp -type f | xargs chmod 644
-  %{__rm} -rf $jarfile
-  cd $langtmp
-  zip -r -D $jarfile locale
-  cd -
-  %{__rm} -rf $tmpdir
+         $extensiondir/chrome/$language/locale/branding/browserconfig.properties
 
   language=`echo $language | sed -e 's/-/_/g'`
   extensiondir=`echo $extensiondir | sed -e "s,^$RPM_BUILD_ROOT,,"`
@@ -403,7 +390,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %changelog
 * Tue Sep 21 2010 Martin Stransky <stransky@redhat.com> - 4.0-0.3.b6
 - Update to 4.0 Beta 6
-- Disabled langpacks for now
 
 * Tue Sep  7 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 4.0-0.2.b4
 - get package building and mostly functional