Wolfgang Rosenauer 2009-10-15 19:38:49 +00:00 committed by Git OBS Bridge
parent 09a3d8be0d
commit a7580a7c29
7 changed files with 22 additions and 58 deletions

View File

@ -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

View File

@ -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}

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2f79209d34f558f7fdc8528c176bdb42de553a16ddb5132fb2176b8000c2008f
size 46604125

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0798d4aa0f1fb59dd0f9c1924a144b8e70e4aca38353ff97137821c9cc9d3218
size 46569387

View File

@ -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 ()
{

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:34ba43d6bcfe77a0856fac75ff40ceed0b45514641d22ccc0891cb71431ab5cb
size 36119024

3
l10n-3.5.4.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8da754c141b1be7f85c64467d4711eecd343c08645604a8656dc1e912638fcd8
size 36379880