From 9e6b91d608be05876b6c3a5770a7b7a451164fafd2a8c6ae9641517813d0c540 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 23 Oct 2009 12:41:12 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=126 --- MozillaFirefox.changes | 7 ------ MozillaFirefox.spec | 18 +++++++-------- firefox-3.5.3-source.tar.bz2 | 3 +++ firefox-3.5.4-source.tar.bz2 | 3 --- firefox-bug506901.patch | 43 ++++++++++++++++++++++++++++++++++++ l10n-3.5.3.tar.bz2 | 3 +++ l10n-3.5.4.tar.bz2 | 3 --- 7 files changed, 58 insertions(+), 22 deletions(-) create mode 100644 firefox-3.5.3-source.tar.bz2 delete mode 100644 firefox-3.5.4-source.tar.bz2 create mode 100644 firefox-bug506901.patch create mode 100644 l10n-3.5.3.tar.bz2 delete mode 100644 l10n-3.5.4.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index c1a80270..77a2d6fc 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,10 +1,3 @@ -------------------------------------------------------------------- -Sat Oct 17 23:19:23 CEST 2009 - wr@rosenauer.org - -- security update to version 3.5.4 (bnc#545277) -- removed upstreamed patch - * firefox-bug506901.patch - ------------------------------------------------------------------- Wed Oct 7 20:11:24 CEST 2009 - llunak@novell.com diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 1cead173..d1c4b17c 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.5.4) +# spec file for package MozillaFirefox (Version 3.5.3) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2009 Wolfgang Rosenauer @@ -21,15 +21,15 @@ Name: MozillaFirefox BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel orbit-devel python unzip update-desktop-files zip -BuildRequires: mozilla-xulrunner191-devel = 1.9.1.4 +BuildRequires: mozilla-xulrunner191-devel = 1.9.1.3 %if %suse_version > 1020 BuildRequires: fdupes %endif License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Provides: web_browser Provides: firefox -Version: 3.5.4 -Release: 1 +Version: 3.5.3 +Release: 3 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -49,6 +49,7 @@ Patch1: firefox-libxul-sdk.patch Patch2: firefox-no-update.patch Patch3: toolkit-download-folder.patch Patch4: mozilla-linkorder.patch +Patch5: firefox-bug506901.patch Patch6: firefox-cross-desktop.patch Patch7: firefox-kde.patch Patch8: firefox-no-gnomevfs.patch @@ -70,7 +71,7 @@ Requires: %{name}-branding = 3.5 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define releasedate 2009101600 +%define releasedate 2009090900 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -149,19 +150,18 @@ cd $RPM_BUILD_DIR/mozilla %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch6 -p1 -%if %suse_version >= 1110 # copy current files and patch them later to keep them in sync cp browser/base/content/browser.xul browser/base/content/browser-kde.xul %patch7 -p1 -# install kde.js -install -m 644 %{SOURCE6} browser/app/profile/kde.js -%endif %patch8 -p1 %patch9 -p1 %patch10 -p1 %patch14 %patch17 +# install kde.js +install -m 644 %{SOURCE6} browser/app/profile/kde.js %build export MOZ_BUILD_DATE=%{releasedate} diff --git a/firefox-3.5.3-source.tar.bz2 b/firefox-3.5.3-source.tar.bz2 new file mode 100644 index 00000000..3b09fd18 --- /dev/null +++ b/firefox-3.5.3-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2f79209d34f558f7fdc8528c176bdb42de553a16ddb5132fb2176b8000c2008f +size 46604125 diff --git a/firefox-3.5.4-source.tar.bz2 b/firefox-3.5.4-source.tar.bz2 deleted file mode 100644 index bfc04b27..00000000 --- a/firefox-3.5.4-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5fbb775d99a3b10a5ac90494307283ed44df9edad87bd8bc170bb71cf02ac9d2 -size 46568319 diff --git a/firefox-bug506901.patch b/firefox-bug506901.patch new file mode 100644 index 00000000..9e394a35 --- /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 () + { diff --git a/l10n-3.5.3.tar.bz2 b/l10n-3.5.3.tar.bz2 new file mode 100644 index 00000000..7ea44de4 --- /dev/null +++ b/l10n-3.5.3.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:34ba43d6bcfe77a0856fac75ff40ceed0b45514641d22ccc0891cb71431ab5cb +size 36119024 diff --git a/l10n-3.5.4.tar.bz2 b/l10n-3.5.4.tar.bz2 deleted file mode 100644 index f7df695f..00000000 --- a/l10n-3.5.4.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6f9645eb4efba565312c9c50e45af2f1b397790df0e14c822f1cc48deee347dd -size 36379898