diff options
| -rw-r--r-- | firefox-2.0-getstartpage.patch | 40 | ||||
| -rw-r--r-- | firefox.spec | 15 |
2 files changed, 10 insertions, 45 deletions
diff --git a/firefox-2.0-getstartpage.patch b/firefox-2.0-getstartpage.patch deleted file mode 100644 index 450d9c3..0000000 --- a/firefox-2.0-getstartpage.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: mozilla/browser/components/nsBrowserContentHandler.js -=================================================================== -RCS file: /cvsroot/mozilla/browser/components/nsBrowserContentHandler.js,v -retrieving revision 1.12.2.23 -diff -d -u -p -r1.12.2.23 nsBrowserContentHandler.js ---- mozilla/browser/components/nsBrowserContentHandler.js 14 Sep 2007 19:59:42 -0000 1.12.2.23 -+++ mozilla/browser/components/nsBrowserContentHandler.js 13 Dec 2007 13:20:44 -0000 -@@ -542,18 +542,14 @@ var nsBrowserContentHandler = { - }, - - get startPage() { -+ var formatter = Components.classes["@mozilla.org/toolkit/URLFormatterService;1"] -+ .getService(Components.interfaces.nsIURLFormatter); -+ - var prefb = Components.classes["@mozilla.org/preferences-service;1"] - .getService(nsIPrefBranch); - -- var uri = prefb.getComplexValue("browser.startup.homepage", -- nsIPrefLocalizedString).data; -+ var uri = formatter.formatURLPref("browser.startup.homepage"); - -- if (!uri) { -- prefb.clearUserPref("browser.startup.homepage"); -- uri = prefb.getComplexValue("browser.startup.homepage", -- nsIPrefLocalizedString).data; -- } -- - var count; - try { - count = prefb.getIntPref("browser.startup.homepage.count"); -@@ -564,8 +560,7 @@ var nsBrowserContentHandler = { - - for (var i = 1; i < count; ++i) { - try { -- var page = prefb.getComplexValue("browser.startup.homepage." + i, -- nsIPrefLocalizedString).data; -+ var page = formatter.formatURLPref("browser.startup.homepage." + i); - uri += "\n" + page; - } - catch (e) { diff --git a/firefox.spec b/firefox.spec index f027612..002963e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -19,7 +19,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 3.0.2 -Release: 1%{?dist} +Release: 2%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -42,7 +42,6 @@ Source23: firefox.1 Source100: find-external-requires -Patch1: firefox-2.0-getstartpage.patch # Upstream patches @@ -95,8 +94,6 @@ compliance, performance and portability. %setup -q -c cd mozilla -%patch1 -p1 -b .getstartpage - # For branding specific patches. %if %{official_branding} @@ -176,11 +173,15 @@ desktop-file-install --vendor mozilla \ # set up our default homepage %{__cat} >> rh-default-prefs << EOF -pref("browser.startup.homepage", "%{homepage}"); pref("startup.homepage_override_url", "%{firstrun}"); pref("startup.homepage_welcome_url", "%{firstrun}"); EOF +# resolves bug #461880 +%{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/browserconfig.properties << EOF +browser.startup.homepage=%{homepage} +EOF + # Export correct locale %{__cat} > $RPM_BUILD_ROOT/%{mozappdir}/defaults/preferences/firefox-l10n.js << EOF pref("general.useragent.locale", "chrome://global/locale/intl.properties"); @@ -333,6 +334,10 @@ fi #--------------------------------------------------------------------- %changelog +* Tue Nov 11 2008 Jan Horak <jhorak@redhat.com> 3.0.2-2 +- Removed firefox-2.0-getstartpage.patch patch +- Start page is set by different way + * Tue Sep 23 2008 Christopher Aillon <caillon@redhat.com> 3.0.2-1 - Update to 3.0.2 |