From 077db9d1cc25dbf7a636b20debc4bfec8ce16eee0686939b56526022c2e3fd83 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sat, 15 Sep 2007 10:06:01 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=23

---
 MozillaFirefox.changes        |  8 ++++++++
 MozillaFirefox.spec           | 13 +++++++------
 firefox-suse-default-prefs.js |  1 +
 search-addons.tar.bz2         |  4 ++--
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index 0fcb686..0d8f855 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Fri Sep 14 23:13:06 CEST 2007 - maw@suse.de
+
+- Update the Novell Support search plugin in search-addons.tar.bz2
+  (#297261)
+- Set the browser.tabs.loadFolderAndReplace preference to false
+  by default (#230759).
+
 -------------------------------------------------------------------
 Wed Sep 12 15:21:06 CEST 2007 - dmueller@suse.de
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index 8a70b72..c0b14e1 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -29,9 +29,9 @@ Obsoletes:      MozillaFirebird <= 1.0.7
 Obsoletes:      mozilla
 %endif
 Version:        2.0.0.6
-Release:        15
+Release:        18
 Summary:        Mozilla Firefox Web Browser
-URL:            http://www.mozilla.org/
+Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
 # Creation of firefox and l10n tarballs:
 # cvs -d :pserver:anonymous:anonymous@cvs-mirror.mozilla.org:/cvsroot co -r MOZILLA_1_8_BRANCH mozilla/client.mk
@@ -132,7 +132,6 @@ Requires:       mozilla-nss >= %( echo `rpm -q --queryformat '%{VERSION}' mozill
 %if %suse_version > 1020
 %define gnome_confdir %{_sysconfdir}
 %define gnome_dir     %{_prefix}
-
 %gconf_schemas_prereq
 %else
 %define gnome_confdir %{_sysconfdir}/opt/gnome
@@ -422,9 +421,7 @@ chmod 755 %{my_requires}
 %endif
 %find_gconf_schemas
 %if %suse_version > 1020
-
 %fdupes $RPM_BUILD_ROOT%_libdir
-
 %fdupes $RPM_BUILD_ROOT%_docdir
 %endif
 chmod -x $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png
@@ -464,7 +461,6 @@ fi
 %endif
 exit 0
 %if %suse_version <= 1000
-
 %posttrans -f %{name}.schemas_posttrans
 
 %triggerin -- IBMJava2-JRE, java2-jre, java2, IBMJava2-SDK, BlackdownJava2-JRE, java-1_4_2-sun-plugin, java-1_5_0-sun-plugin
@@ -559,6 +555,11 @@ exit 0
 %endif
 
 %changelog
+* Fri Sep 14 2007 - maw@suse.de
+- Update the Novell Support search plugin in search-addons.tar.bz2
+  (#297261)
+- Set the browser.tabs.loadFolderAndReplace preference to false
+  by default (#230759).
 * Wed Sep 12 2007 - dmueller@suse.de
 - fix hardlinks accross partitions
 * Thu Sep 06 2007 - maw@suse.de
diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js
index 0b7acf0..5c26248 100644
--- a/firefox-suse-default-prefs.js
+++ b/firefox-suse-default-prefs.js
@@ -19,3 +19,4 @@ pref("print.print_edge_bottom", 14); // 1/100 of an inch
 pref("startup.homepage_override_url", "resource:/browserconfig.properties");
 pref("browser.throbber.url", "resource:/browserconfig.properties");
 pref("browser.backspace_action", 2);
+pref("browser.tabs.loadFolderAndReplace", "false");
\ No newline at end of file
diff --git a/search-addons.tar.bz2 b/search-addons.tar.bz2
index 1510b13..a4aa4c6 100644
--- a/search-addons.tar.bz2
+++ b/search-addons.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cf5066695cf24ea4f0dc28a86f4e5e7fc69112b5761caecb81c3dd276cba29c2
-size 2809
+oid sha256:b7b6b93daaf5e4c9ee49e5b3d5690242a3c756cdc6252de7cf44c14a9a395ea2
+size 3989