From a7580a7c296474a86d5145e292e74ebaea111391cf2c48d5ce7e9d5a27eaa1be Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 15 Oct 2009 19:38:49 +0000 Subject: [PATCH 1/3] update to 3.5.4 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=123 --- 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, 22 insertions(+), 58 deletions(-) delete mode 100644 firefox-3.5.3-source.tar.bz2 create mode 100644 firefox-3.5.4-source.tar.bz2 delete mode 100644 firefox-bug506901.patch delete mode 100644 l10n-3.5.3.tar.bz2 create mode 100644 l10n-3.5.4.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 77a2d6f..81d3213 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Oct 15 21:10:50 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 d1c4b17..52c19cc 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.5.3) +# spec file for package MozillaFirefox (Version 3.5.4) # # 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.3 +BuildRequires: mozilla-xulrunner191-devel = 1.9.1.4 %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.3 -Release: 3 +Version: 3.5.4 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -49,7 +49,6 @@ 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 @@ -71,7 +70,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 2009090900 +%define releasedate 2009101400 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -150,18 +149,19 @@ 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 deleted file mode 100644 index 3b09fd1..0000000 --- a/firefox-3.5.3-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..6472c31 --- /dev/null +++ b/firefox-3.5.4-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0798d4aa0f1fb59dd0f9c1924a144b8e70e4aca38353ff97137821c9cc9d3218 +size 46569387 diff --git a/firefox-bug506901.patch b/firefox-bug506901.patch deleted file mode 100644 index 9e394a3..0000000 --- a/firefox-bug506901.patch +++ /dev/null @@ -1,43 +0,0 @@ -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 deleted file mode 100644 index 7ea44de..0000000 --- a/l10n-3.5.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -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 new file mode 100644 index 0000000..8d54b01 --- /dev/null +++ b/l10n-3.5.4.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8da754c141b1be7f85c64467d4711eecd343c08645604a8656dc1e912638fcd8 +size 36379880 From 260ce94709a3e36ae248d675294c59d3d5a5fa100bddc959cec8df09265e8697 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 17 Oct 2009 11:49:18 +0000 Subject: [PATCH 2/3] fix source archives OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=124 --- firefox-3.5.4-source.tar.bz2 | 4 ++-- l10n-3.5.4.tar.bz2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/firefox-3.5.4-source.tar.bz2 b/firefox-3.5.4-source.tar.bz2 index 6472c31..ae91d11 100644 --- a/firefox-3.5.4-source.tar.bz2 +++ b/firefox-3.5.4-source.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0798d4aa0f1fb59dd0f9c1924a144b8e70e4aca38353ff97137821c9cc9d3218 -size 46569387 +oid sha256:23f566724e0506e7029ca402cb05a63f0308b3c75ce02664b0e8a94b8f705eb6 +size 46567319 diff --git a/l10n-3.5.4.tar.bz2 b/l10n-3.5.4.tar.bz2 index 8d54b01..ffb61fa 100644 --- a/l10n-3.5.4.tar.bz2 +++ b/l10n-3.5.4.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8da754c141b1be7f85c64467d4711eecd343c08645604a8656dc1e912638fcd8 -size 36379880 +oid sha256:ec26db19ae017fd2ea3c64f595879601eb9ce79d9132634ddf960d1cf3f86fbb +size 36385300 From a93229406a14cb0bb6e10626c03f394ddbb626afffbad0395eb6c2cec59fab44 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Sat, 17 Oct 2009 21:31:52 +0000 Subject: [PATCH 3/3] new sources (BUILD3) OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=125 --- MozillaFirefox.changes | 2 +- MozillaFirefox.spec | 2 +- firefox-3.5.4-source.tar.bz2 | 4 ++-- l10n-3.5.4.tar.bz2 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 81d3213..c1a8027 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,5 +1,5 @@ ------------------------------------------------------------------- -Thu Oct 15 21:10:50 CEST 2009 - wr@rosenauer.org +Sat Oct 17 23:19:23 CEST 2009 - wr@rosenauer.org - security update to version 3.5.4 (bnc#545277) - removed upstreamed patch diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 52c19cc..1cead17 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -70,7 +70,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 2009101400 +%define releasedate 2009101600 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 diff --git a/firefox-3.5.4-source.tar.bz2 b/firefox-3.5.4-source.tar.bz2 index ae91d11..bfc04b2 100644 --- a/firefox-3.5.4-source.tar.bz2 +++ b/firefox-3.5.4-source.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:23f566724e0506e7029ca402cb05a63f0308b3c75ce02664b0e8a94b8f705eb6 -size 46567319 +oid sha256:5fbb775d99a3b10a5ac90494307283ed44df9edad87bd8bc170bb71cf02ac9d2 +size 46568319 diff --git a/l10n-3.5.4.tar.bz2 b/l10n-3.5.4.tar.bz2 index ffb61fa..f7df695 100644 --- a/l10n-3.5.4.tar.bz2 +++ b/l10n-3.5.4.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ec26db19ae017fd2ea3c64f595879601eb9ce79d9132634ddf960d1cf3f86fbb -size 36385300 +oid sha256:6f9645eb4efba565312c9c50e45af2f1b397790df0e14c822f1cc48deee347dd +size 36379898