Firefox 4.0 Beta 10

And update firefox-default.patch to continue applying to the new tree

4 files changed, 19 insertions, 14 deletions

diff --git a/.gitignore b/.gitignore
index 58a5802..1890efb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-4.0b8-20101221.tar.bz2
 /firefox-4.0b9.source.tar.bz2
 /firefox-langpacks-4.0b9-20110111.tar.bz2
+/firefox-4.0b10.source.tar.bz2
+/firefox-langpacks-4.0b10-20110125.tar.bz2
diff --git a/firefox-default.patch b/firefox-default.patch
index a6c61f1..6a1d83b 100644
--- a/firefox-default.patch
+++ b/firefox-default.patch
@@ -69,14 +69,14 @@ diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellSe
 @@ -215,8 +209,8 @@ nsGNOMEShellService::SetDefaultBrowser(P
  
    nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
- 
--  nsCAutoString appKeyValue(mAppPath);
--  appKeyValue.Append(" \"%s\"");
-+  nsCAutoString appKeyValue(MOZ_APP_NAME);
-+  appKeyValue.Append(" %s");
-   unsigned int i;
- 
-   for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
+   if (gconf) {
+-    nsCAutoString appKeyValue(mAppPath);
+-    appKeyValue.Append(" \"%s\"");
++    nsCAutoString appKeyValue(MOZ_APP_NAME);
++    appKeyValue.Append(" %s");
+     for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
+       if (appProtocols[i].essential || aClaimAllTypes) {
+         gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
 diff -up firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h
 --- firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h.default	2010-08-06 03:08:59.000000000 +0200
 +++ firefox-4.0/mozilla-central/browser/components/shell/src/nsGNOMEShellService.h	2010-08-30 16:35:22.000000000 +0200
diff --git a/firefox.spec b/firefox.spec
index a599af0..8318199 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -16,7 +16,7 @@
 
 # xulrunner_version matches the firefox package.
 # xulrunner_version_max is first next incompatible xulrunner version
-%define xulrunner_version       2.0-0.15b9
+%define xulrunner_version       2.0-0.17b10
 %define xulrunner_version_max   2.1
 
 %define official_branding       1
@@ -27,19 +27,19 @@
 %define cvsdate 20080327
 %define nightly .cvs%{cvsdate}
 %else
-%define prever  b9
+%define prever  b10
 %endif
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        4.0
-Release:        0.12%{?prever}%{?dist}
+Release:        0.13%{?prever}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?prever}/source/firefox-%{version}%{?prever}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?prever}-20110111.tar.bz2
+Source1:        firefox-langpacks-%{version}%{?prever}-20110125.tar.bz2
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -404,6 +404,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Jan 25 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.13b10
+- Firefox 4.0 Beta 10
+
 * Fri Jan 14 2011 Christopher Aillon <caillon@redhat.com> - 4.0-0.12b9
 - Firefox 4.0 Beta 9
 
diff --git a/sources b/sources
index 9e34c42..261e382 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-be58ef0be58cfa3d1efda63bec41fc25  firefox-4.0b9.source.tar.bz2
-3c67102dc03fa8a56cf13210b86c60e3  firefox-langpacks-4.0b9-20110111.tar.bz2
+cfbd4a465e5aeb5f0a67cb0b3ad92249  firefox-4.0b10.source.tar.bz2
+0a97d524c1688b5895cc87241e578614  firefox-langpacks-4.0b10-20110125.tar.bz2