From e580d2a6de253d40a24dbe4c481fa5438abb2f961386013a014ff6933e3642e2 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Wed, 29 Jul 2009 12:51:51 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=63

---
 MozillaFirefox.changes  |  6 ++++++
 MozillaFirefox.spec     | 16 +++++++++------
 firefox-bug506901.patch | 43 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 6 deletions(-)
 create mode 100644 firefox-bug506901.patch

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index c3eec3a..c7991b4 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Jul 28 14:54:46 CEST 2009 - wr@rosenauer.org
+
+- fixed %exclude usage
+- fixed preferences' advanced pane for fresh profiles (bmo#506901)
+
 -------------------------------------------------------------------
 Wed Jul 15 20:13:19 CEST 2009 - wr@rosenauer.org
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index f9d7177..c88f7fa 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -29,7 +29,7 @@ License:        GPL v2 or later ; LGPL v2.1 or later ; MPL
 Provides:       web_browser
 Provides:       firefox
 Version:        3.5.1
-Release:        1
+Release:        2
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
@@ -48,6 +48,7 @@ Patch1:         firefox-libxul-sdk.patch
 Patch2:         firefox-no-update.patch
 Patch3:         toolkit-download-folder.patch
 Patch4:         mozilla-linkorder.patch
+Patch5:         firefox-bug506901.patch
 Patch14:        credits.patch
 Patch17:        firefox-appname.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -129,6 +130,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 %patch14
 %patch17
 
@@ -242,6 +244,13 @@ done
 cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm
 %endif
 %suse_update_desktop_file %{name} Network WebBrowser X-Ximian-Main X-Ximian-Toplevel GTK
+# excludes
+rm -f $RPM_BUILD_ROOT%{progdir}/updater.ini
+rm -f $RPM_BUILD_ROOT%{progdir}/removed-files
+rm -f $RPM_BUILD_ROOT%{progdir}/README.txt
+rm -f $RPM_BUILD_ROOT%{progdir}/old-homepage-default.properties
+rm -f $RPM_BUILD_ROOT%{progdir}/run-mozilla.sh
+# fdupes
 %if %suse_version > 1020
 %fdupes $RPM_BUILD_ROOT%{progdir}
 %fdupes $RPM_BUILD_ROOT%{_datadir}
@@ -308,12 +317,7 @@ fi
 %{progdir}/%{progname}
 %{progdir}/application.ini
 %{progdir}/blocklist.xml
-%exclude %{progdir}/updater.ini
-%exclude %{progdir}/removed-files
-%exclude %{progdir}/README.txt
-%exclude %{progdir}/old-homepage-default.properties
 %exclude %{progdir}/components/libnkgnomevfs.so
-%exclude %{progdir}/run-mozilla.sh
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/mime/packages/%{progname}.xml
 %{_datadir}/pixmaps/firefox*
diff --git a/firefox-bug506901.patch b/firefox-bug506901.patch
new file mode 100644
index 0000000..9e394a3
--- /dev/null
+++ b/firefox-bug506901.patch
@@ -0,0 +1,43 @@
+diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js
+--- a/browser/components/preferences/advanced.js
++++ b/browser/components/preferences/advanced.js
+@@ -46,32 +46,32 @@ var gAdvancedPane = {
+   /**
+    * Brings the appropriate tab to the front and initializes various bits of UI.
+    */
+   init: function ()
+   {
+     this._inited = true;
+     var advancedPrefs = document.getElementById("advancedPrefs");
+ 
++#ifdef MOZ_UPDATER
++    this.updateAppUpdateItems();
++    this.updateAutoItems();
++    this.updateModeItems();
++#endif
++    this.updateOfflineApps();
++
+     var extraArgs = window.arguments[1];
+     if (extraArgs && extraArgs["advancedTab"]){
+       advancedPrefs.selectedTab = document.getElementById(extraArgs["advancedTab"]);
+     } else {
+       var preference = document.getElementById("browser.preferences.advanced.selectedTabIndex");
+       if (preference.value === null)
+         return;
+       advancedPrefs.selectedIndex = preference.value;
+     }
+-
+-#ifdef MOZ_UPDATER
+-    this.updateAppUpdateItems();
+-    this.updateAutoItems();
+-    this.updateModeItems();
+-#endif
+-    this.updateOfflineApps();
+   },
+ 
+   /**
+    * Stores the identity of the current tab in preferences so that the selected
+    * tab can be persisted between openings of the preferences window.
+    */
+   tabSelectionChanged: function ()
+   {