- Ship langpacks again from upstream

- Stop providing MozillaFirebird and mozilla-firebird

4 files changed, 29 insertions, 16 deletions

diff --git a/.cvsignore b/.cvsignore
index 4d39736..97b9c72 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -15,3 +15,4 @@ firefox-1.5b1-source.tar.bz2
 firefox-1.5rc1-source.tar.bz2
 firefox-1.5rc3-source.tar.bz2
 firefox-1.5-source.tar.bz2
+firefox-langpacks-20060125.tar.bz2
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index de36822..4877bc1 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -6,3 +6,4 @@ pref("browser.startup.homepage", "chrome://browser-region/locale/region.properti
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
+pref("intl.locale.matchOS", true);
diff --git a/firefox.spec b/firefox.spec
index 7a41f85..8e27e3b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -9,7 +9,7 @@
 Summary:        Mozilla Firefox Web browser.
 Name:           firefox
 Version:        1.5
-Release:        4
+Release:        5
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPL/LGPL
 Group:          Applications/Internet
@@ -20,7 +20,7 @@ Group:          Applications/Internet
 %endif
 Source0:        %{tarball}
 Source1:        firefox-gnomestripe-0.1.tar.gz
-Source2:        firefox-1.0-locales.tar.bz2
+Source2:        firefox-langpacks-20060125.tar.bz2
 
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -83,7 +83,6 @@ Requires:       nspr >= %{nspr_version}
 Requires:       nss >= %{nss_version}
 Requires:       desktop-file-utils >= %{desktop_file_utils_version}
 Obsoletes:      phoenix, mozilla-firebird, MozillaFirebird
-Provides:       mozilla-firebird = %{epoch}:%{version}, MozillaFirebird = %{epoch}:%{version}
 Provides:       webclient
 %define ffdir %{_libdir}/firefox-%{version}
 
@@ -141,18 +140,6 @@ compliance, performance and portability.
 export RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS | %{__sed} s/-O2/-Os/`
 MAKE="gmake %{?_smp_mflags}" make -f client.mk build
 
-for locale in `cat browser/locales/all-locales`
-do
-  if [ -d browser/locales/$locale ] ; then
-    %{__perl} -pi -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" \
-       browser/locales/$locale/chrome/browser-region/region.properties
-    %{__make} -C browser/locales AB_CD=$locale
-  fi
-  if [ -d toolkit/locales/$locale ] ; then
-    %{__make} -C toolkit/locales AB_CD=$locale
-  fi
-done
-
 #---------------------------------------------------------------------
 
 %install
@@ -216,6 +203,26 @@ EOF
 # own mozilla plugin dir (#135050)
 %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/plugins
 
+# Install langpacks
+%{__mkdir_p} $RPM_BUILD_ROOT%{ffdir}/extensions
+%{__tar} xjf %{SOURCE2}
+for langpack in `ls firefox-langpacks/*.xpi`; do
+  language=`basename $langpack .xpi`
+  extensiondir=$RPM_BUILD_ROOT%{ffdir}/extensions/langpack-$language@firefox.mozilla.org
+  %{__mkdir_p} $extensiondir
+  unzip $langpack -d $extensiondir
+
+  %{__rm} -rf locale
+  jarfile=$extensiondir/chrome/$language.jar
+  unzip $jarfile
+  sed -i -e "s|browser.startup.homepage.*$|browser.startup.homepage=%{indexhtml}|g;" locale/browser-region/region.properties
+  %{__rm} -rf $jarfile
+  zip -r -D $jarfile locale
+  %{__rm} -rf locale
+
+done
+%{__rm} -rf firefox-langpacks
+
 # ghost files
 touch $RPM_BUILD_ROOT%{ffdir}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{ffdir}/components/xpti.dat
@@ -256,6 +263,10 @@ fi
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jan 26 2006 Christopher Aillon <caillon@redhat.com> - 1.5-5
+- Ship langpacks again from upstream
+- Stop providing MozillaFirebird and mozilla-firebird
+
 * Tue Jan  3 2006 Christopher Aillon <caillon@redhat.com> - 1.5-4
 - Looks like we can build ppc64 again.  Happy New Year!
 
diff --git a/sources b/sources
index 73ca25d..d0c626d 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 b628d5f24a49ab15d1943b7d694edd90  firefox-gnomestripe-0.1.tar.gz
-2a9c2ae93baa98b96d28db380a805442  firefox-1.0-locales.tar.bz2
 fa915ddcadecda30ed3e13694f26a779  firefox-1.5-source.tar.bz2
+1f39da3a36cb722973e21b724eb59d0b  firefox-langpacks-20060125.tar.bz2