--- a/MozillaFirefox/MozillaFirefox.spec	Tue Jan 18 10:00:48 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Sat Jan 22 11:10:25 2011 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package MozillaFirefox (Version 4.0b9)
+# spec file for package MozillaFirefox (Version 4.0b10)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2011 Wolfgang Rosenauer
@@ -29,14 +29,14 @@
 BuildRequires:  wireless-tools
 %endif
 %if 0%{?use_xulrunner}
-BuildRequires:  %{xulrunner}-devel = 2.0b9
+BuildRequires:  %{xulrunner}-devel = 2.0b10
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        4.0b9
+Version:        4.0b10
 Provides:       web_browser
 Provides:       firefox = %{version}
 Release:        1
-%define         releasedate 2011011000
+%define         releasedate 2011012100
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -60,10 +60,9 @@
 Patch6:         firefox-ui-lockdown.patch
 Patch7:         firefox-no-sync-l10n.patch
 Patch8:         firefox-libxulsdk-locales.patch
-Patch9:        firefox-no-default-ualocale.patch
+Patch9:         firefox-no-default-ualocale.patch
 Patch10:        firefox-multilocale-chrome.patch
-Patch11:        firefox-shell-bmo624267.patch
-Patch12:        firefox-shellservice.patch
+Patch11:        firefox-shellservice.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires(post):   coreutils shared-mime-info desktop-file-utils
 Requires(postun): shared-mime-info desktop-file-utils
@@ -172,7 +171,6 @@
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
-%patch12 -p1
 
 %build
 export MOZ_BUILD_DATE=%{releasedate}
@@ -203,7 +201,7 @@
 ac_add_options --disable-updater
 ac_add_options --disable-tests
 ac_add_options --disable-debug
-ac_add_options --enable-update-channel=beta
+#ac_add_options --enable-update-channel=beta
 EOF
 %if 0%{?use_xulrunner}
 cat << EOF >> $MOZCONFIG

--- a/MozillaFirefox/firefox-shell-bmo624267.patch	Tue Jan 18 10:00:48 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../firefox-shell-bmo624267.patch
\ No newline at end of file

--- a/firefox-multilocale-chrome.patch	Tue Jan 18 10:00:48 2011 +0100
+++ b/firefox-multilocale-chrome.patch	Sat Jan 22 11:10:25 2011 +0100
@@ -1,12 +1,12 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 80550b99f4e1c3bfe561edf396dec27d47bf1696
+# Parent e3da64303bf904a8da2410754026b7a00480a589
 Add searchplugins to chrome packaging for proper localization
 
 diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
 --- a/browser/app/profile/firefox.js
 +++ b/browser/app/profile/firefox.js
-@@ -319,16 +319,20 @@ pref("browser.download.manager.scanWhenD
+@@ -321,16 +321,20 @@ pref("browser.download.manager.scanWhenD
  pref("browser.download.manager.resumeOnWakeDelay", 10000);
  
  // search engines URL
@@ -83,13 +83,16 @@
 diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
 --- a/browser/locales/jar.mn
 +++ b/browser/locales/jar.mn
-@@ -87,8 +87,9 @@
+@@ -81,11 +81,12 @@
+     locale/browser-region/region.properties        (%chrome/browser-region/region.properties)
+ # the following files are browser-specific overrides
+ *   locale/browser/netError.dtd                (%chrome/overrides/netError.dtd)
+ *   locale/browser/appstrings.properties       (%chrome/overrides/appstrings.properties)
+ *   locale/browser/downloads/settingsChange.dtd  (%chrome/overrides/settingsChange.dtd)
  % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
  % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
  % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
- #if MOZ_UPDATE_CHANNEL == beta
++    locale/browser/searchplugins/list.txt   (%searchplugins/list.txt)
  % locale testpilot @AB_CD@ %locale/feedback/
      locale/feedback/main.dtd                       (%feedback/main.dtd)
      locale/feedback/main.properties                (%feedback/main.properties)
- #endif
-+    locale/browser/searchplugins/list.txt   (%searchplugins/list.txt)

--- a/firefox-shell-bmo624267.patch	Tue Jan 18 10:00:48 2011 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,82 +0,0 @@
-# HG changeset patch
-# Parent 6c4a0e0acb3a071dbfde60e975f68f18c85bbff8
-# User timeless@mozdev.org
-Bug 624267 Crash on Ubuntu [@ nsGNOMEShellService::SetDefaultBrowser ]
-r=roc
-
-diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
---- a/browser/components/shell/src/nsGNOMEShellService.cpp
-+++ b/browser/components/shell/src/nsGNOMEShellService.cpp
-@@ -214,30 +214,31 @@ nsGNOMEShellService::SetDefaultBrowser(P
- #endif
- 
-   nsCOMPtr<nsIGConfService> gconf = do_GetService(NS_GCONFSERVICE_CONTRACTID);
--
--  nsCAutoString appKeyValue(mAppPath);
--  appKeyValue.Append(" \"%s\"");
--  unsigned int i;
--
--  for (i = 0; i < NS_ARRAY_LENGTH(appProtocols); ++i) {
--    if (appProtocols[i].essential || aClaimAllTypes) {
--      gconf->SetAppForProtocol(nsDependentCString(appProtocols[i].name),
--                               appKeyValue);
-+  if (gconf) {
-+    nsCAutoString appKeyValue(mAppPath);
-+    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),
-+                                 appKeyValue);
-+      }
-     }
-   }
- 
-   // set handler for .html and xhtml files and MIME types:
-   if (aClaimAllTypes) {
-+    nsresult rv;
-     nsCOMPtr<nsIGIOService> giovfs =
--      do_GetService(NS_GIOSERVICE_CONTRACTID);
-+      do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
-+    NS_ENSURE_SUCCESS(rv, rv);
- 
-     nsCOMPtr<nsIStringBundleService> bundleService =
--      do_GetService(NS_STRINGBUNDLE_CONTRACTID);
--    NS_ENSURE_TRUE(bundleService, NS_ERROR_OUT_OF_MEMORY);
-+      do_GetService(NS_STRINGBUNDLE_CONTRACTID, &rv);
-+    NS_ENSURE_SUCCESS(rv, rv);
- 
-     nsCOMPtr<nsIStringBundle> brandBundle;
--    bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
--    NS_ENSURE_TRUE(brandBundle, NS_ERROR_FAILURE);
-+    rv = bundleService->CreateBundle(BRAND_PROPERTIES, getter_AddRefs(brandBundle));
-+    NS_ENSURE_SUCCESS(rv, rv);
- 
-     nsString brandShortName, brandFullName;
-     brandBundle->GetStringFromName(NS_LITERAL_STRING("brandShortName").get(),
-@@ -247,17 +248,16 @@ nsGNOMEShellService::SetDefaultBrowser(P
- 
-     // use brandShortName as the application id.
-     NS_ConvertUTF16toUTF8 id(brandShortName);
--    if (giovfs) {
--      nsCOMPtr<nsIGIOMimeApp> appInfo;
--      giovfs->CreateAppFromCommand(mAppPath,
--                                id,
--                                getter_AddRefs(appInfo));
-+    nsCOMPtr<nsIGIOMimeApp> appInfo;
-+    rv = giovfs->CreateAppFromCommand(mAppPath,
-+                                      id,
-+                                      getter_AddRefs(appInfo));
-+    NS_ENSURE_SUCCESS(rv, rv);
- 
--      // Add mime types for html, xhtml extension and set app to just created appinfo.
--      for (i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
--        appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
--        appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
--      }
-+    // Add mime types for html, xhtml extension and set app to just created appinfo.
-+    for (unsigned int i = 0; i < NS_ARRAY_LENGTH(appTypes); ++i) {
-+      appInfo->SetAsDefaultForMimeType(nsDependentCString(appTypes[i].mimeType));
-+      appInfo->SetAsDefaultForFileExtensions(nsDependentCString(appTypes[i].extensions));
-     }
-   }
- 

--- a/mozilla-xulrunner20/create-tar.sh	Tue Jan 18 10:00:48 2011 +0100
+++ b/mozilla-xulrunner20/create-tar.sh	Sat Jan 22 11:10:25 2011 +0100
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b9_RELEASE"
-VERSION="2.0b9"
+RELEASE_TAG="FIREFOX_4_0b10_RELEASE"
+VERSION="2.0b10"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla

--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Tue Jan 18 10:00:48 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Sat Jan 22 11:10:25 2011 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package mozilla-xulrunner20 (Version 2.0b9)
+# spec file for package mozilla-xulrunner20 (Version 2.0b10)
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2011 Wolfgang Rosenauer
@@ -30,10 +30,10 @@
 BuildRequires:  wireless-tools
 %endif
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
-Version:        2.0b9
+Version:        2.0b10
 Release:        1
-%define         releasedate 2011011000
-%define         version_internal 2.0b9
+%define         releasedate 2011012100
+%define         version_internal 2.0b10
 %define         apiversion 2.0
 %define         uaweight 199900
 Summary:        Mozilla Runtime Environment 2.0
@@ -209,7 +209,7 @@
 #%patch9 -p1
 #%patch10 -p1
 %if %suse_version < 1120
-%patch11 -p1
+#%patch11 -p1
 %endif
 %patch12 -p1
 %patch13 -p1

--- a/series	Tue Jan 18 10:00:48 2011 +0100
+++ b/series	Sat Jan 22 11:10:25 2011 +0100
@@ -9,7 +9,7 @@
 #mozilla-gconf-backend.patch
 #gecko-lockdown.patch
 #toolkit-ui-lockdown.patch
-mozilla-cpuid.patch
+#mozilla-cpuid.patch
 #mozilla-cairo-lcd.patch
 mozilla-language.patch
 mozilla-gio.patch
@@ -24,5 +24,4 @@
 firefox-libxulsdk-locales.patch
 firefox-no-default-ualocale.patch
 firefox-multilocale-chrome.patch
-firefox-shell-bmo624267.patch
 firefox-shellservice.patch