rpms/firefox/devel .cvsignore, 1.18, 1.19 firefox-redhat-default-prefs.js, 1.5, 1.6 firefox.spec, 1.96, 1.97 sources, 1.20, 1.21

[fedora-cvs-commits at redhat.com]

Author: caillon

Update of /cvs/dist/rpms/firefox/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv1502

Modified Files:
	.cvsignore firefox-redhat-default-prefs.js firefox.spec 
	sources 
Log Message:
* Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
- Ship langpacks again from upstream
- Stop providing MozillaFirebird and mozilla-firebird



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore	30 Nov 2005 04:16:47 -0000	1.18
+++ .cvsignore	27 Jan 2006 03:35:21 -0000	1.19
@@ -15,3 +15,4 @@
 firefox-1.5rc1-source.tar.bz2
 firefox-1.5rc3-source.tar.bz2
 firefox-1.5-source.tar.bz2
+firefox-langpacks-20060125.tar.bz2


Index: firefox-redhat-default-prefs.js
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox-redhat-default-prefs.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- firefox-redhat-default-prefs.js	23 Jul 2005 00:32:23 -0000	1.5
+++ firefox-redhat-default-prefs.js	27 Jan 2006 03:35:21 -0000	1.6
@@ -6,3 +6,4 @@
 pref("general.smoothScroll",                true);
 pref("general.useragent.vendor", "Fedora");
 pref("general.useragent.vendorSub", "FIREFOX_RPM_VR");
+pref("intl.locale.matchOS", true);


Index: firefox.spec
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- firefox.spec	3 Jan 2006 16:41:28 -0000	1.96
+++ firefox.spec	27 Jan 2006 03:35:21 -0000	1.97
@@ -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 @@
 %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:       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 @@
 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 @@
 # 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 at 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 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Jan 26 2006 Christopher Aillon <caillon at redhat.com> - 1.5-5
+- Ship langpacks again from upstream
+- Stop providing MozillaFirebird and mozilla-firebird
+
 * Tue Jan  3 2006 Christopher Aillon <caillon at redhat.com> - 1.5-4
 - Looks like we can build ppc64 again.  Happy New Year!
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/firefox/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- sources	30 Nov 2005 04:16:47 -0000	1.20
+++ sources	27 Jan 2006 03:35:21 -0000	1.21
@@ -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