--- a/MozillaFirefox/MozillaFirefox.spec	Fri Apr 09 20:51:09 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Apr 11 13:01:13 2010 +0200
@@ -36,7 +36,7 @@
 Provides:       firefox
 Version:        3.6.4
 Release:        1
-%define         releasedate 2010040900
+%define         releasedate 2010041000
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers

--- a/gecko-lockdown.patch	Fri Apr 09 20:51:09 2010 +0200
+++ b/gecko-lockdown.patch	Sun Apr 11 13:01:13 2010 +0200
@@ -333,7 +333,7 @@
 diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
 --- a/modules/libpref/src/init/all.js
 +++ b/modules/libpref/src/init/all.js
-@@ -842,16 +842,17 @@ pref("network.automatic-ntlm-auth.truste
+@@ -853,16 +853,17 @@ pref("network.automatic-ntlm-auth.truste
  // response to a NTLM challenge.  By default, this is disabled since servers
  // should almost never need the LM hash, and the LM hash is what makes NTLM
  // authentication less secure.  See bug 250691 for further details.
@@ -344,14 +344,14 @@
  pref("permissions.default.image",           1); // 1-Accept, 2-Deny, 3-dontAcceptForeign
 +pref("permissions.honorExceptions.image",   true);
  
- #ifndef XP_MACOSX
- #ifdef XP_UNIX
  pref("network.proxy.type",                  5);
- #else
- pref("network.proxy.type",                  0);
- #endif
- #else
-@@ -869,16 +870,17 @@ pref("network.proxy.ssl_port",          
+ 
+ pref("network.proxy.ftp",                   "");
+ pref("network.proxy.ftp_port",              0);
+ pref("network.proxy.gopher",                "");
+ pref("network.proxy.gopher_port",           0);
+ pref("network.proxy.http",                  "");
+@@ -872,16 +873,17 @@ pref("network.proxy.ssl_port",          
  pref("network.proxy.socks",                 "");
  pref("network.proxy.socks_port",            0);
  pref("network.proxy.socks_version",         5);

--- a/mozilla-startup-notification.patch	Fri Apr 09 20:51:09 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,46 +0,0 @@
-From: Ginn Chen <ginn.chen@sun.com>
-Subject: Firefox 3.5 broken startup notification
-References:
-https://bugzilla.mozilla.org/show_bug.cgi?id=534845
-
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3556,30 +3556,23 @@ XRE_main(int argc, char* argv[], const n
- #ifdef XP_MACOSX
-       if (gBinaryPath) {
-         static char kEnvVar[MAXPATHLEN];
-         sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath);
-         PR_SetEnv(kEnvVar);
-       }
- #endif
- 
--// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/?
--// but the hidden window has been destroyed so toolkit is NULL anyway.
--#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2)
--      nsGTKToolkit* toolkit = GetGTKToolkit();
--      if (toolkit) {
--        nsCAutoString currentDesktopStartupID;
--        toolkit->GetDesktopStartupID(&currentDesktopStartupID);
--        if (!currentDesktopStartupID.IsEmpty()) {
--          nsCAutoString desktopStartupEnv;
--          desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
--          desktopStartupEnv.Append(currentDesktopStartupID);
--          // Leak it with extreme prejudice!
--          PR_SetEnv(ToNewCString(desktopStartupEnv));
--        }
-+#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2)
-+      if (!desktopStartupID.IsEmpty()) {
-+        nsCAutoString desktopStartupEnv;
-+        desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID=");
-+        desktopStartupEnv.Append(desktopStartupID);
-+        // Leak it with extreme prejudice!
-+        PR_SetEnv(ToNewCString(desktopStartupEnv));
-       }
- #endif
- 
- #ifdef MOZ_WIDGET_GTK2
-       MOZ_gdk_display_close(display);
- #endif
- 
-       rv = LaunchChild(nativeApp, appInitiatedRestart);

--- a/mozilla-xulrunner192/mozilla-startup-notification.patch	Fri Apr 09 20:51:09 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-startup-notification.patch
\ No newline at end of file

--- a/mozilla-xulrunner192/mozilla-xulrunner192.spec	Fri Apr 09 20:51:09 2010 +0200
+++ b/mozilla-xulrunner192/mozilla-xulrunner192.spec	Sun Apr 11 13:01:13 2010 +0200
@@ -41,7 +41,7 @@
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 Version:        1.9.2.4
 Release:        1
-%define         releasedate 2010040900
+%define         releasedate 2010041000
 %define         version_internal 1.9.2.4pre
 %define         apiversion 1.9.2
 %define         uaweight 192040
@@ -75,7 +75,6 @@
 Patch6:         mozilla-helper-app.patch
 Patch7:         mozilla-prefer_plugin_pref.patch
 Patch8:         mozilla-shared-nss-db.patch
-Patch9:         mozilla-startup-notification.patch
 Patch10:        mozilla-kde.patch
 # PATCH-FEATURE-SLED FATE#302023, FATE#302024
 Patch11:        mozilla-gconf-backend.patch
@@ -220,7 +219,6 @@
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %if %suse_version >= 1110
 %patch10 -p1
 %endif

--- a/series	Fri Apr 09 20:51:09 2010 +0200
+++ b/series	Sun Apr 11 13:01:13 2010 +0200
@@ -9,7 +9,6 @@
 mozilla-helper-app.patch
 mozilla-prefer_plugin_pref.patch
 mozilla-shared-nss-db.patch
-mozilla-startup-notification.patch
 mozilla-kde.patch
 mozilla-gconf-backend.patch
 gecko-lockdown.patch