diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 59a5295..fdfa407 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 23 22:31:21 CET 2009 - wr@rosenauer.org + +- rebased patches for fuzz=0 + ------------------------------------------------------------------- Thu Nov 5 19:49:33 UTC 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index c4e80e3..d33d3b5 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -29,7 +29,7 @@ License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later Provides: web_browser Provides: firefox Version: 3.5.5 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -160,8 +160,8 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch14 -%patch17 +%patch14 -p1 +%patch17 -p1 %build export MOZ_BUILD_DATE=%{releasedate} diff --git a/credits.patch b/credits.patch index 1795952..383540f 100644 --- a/credits.patch +++ b/credits.patch @@ -1,14 +1,23 @@ -Index: browser/base/content/credits.xhtml -================================================================================ ---- browser/base/content/credits.xhtml -+++ browser/base/content/credits.xhtml -@@ -431,6 +431,9 @@ +diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml +--- a/browser/base/content/credits.xhtml ++++ b/browser/base/content/credits.xhtml +@@ -579,16 +579,19 @@ +
  • Satoko Takita Yamaguchi (Chibi)
  • +
  • Christine Yen
  • Kohei Yoshino
  • +
  • Shigeru Yoshitake
  • Boris Zbarsky
  • +
  • Marco Zehe
  • +
  • Matthew Zeier
  • + +

    openSUSE RPM packaging

    + - &credit.translation; +
    + &credit.translation; +
    + + +
    diff --git a/firefox-appname.patch b/firefox-appname.patch index 4556b8d..88e8daa 100644 --- a/firefox-appname.patch +++ b/firefox-appname.patch @@ -1,6 +1,12 @@ ---- browser/components/shell/src/nsGNOMEShellService.cpp -+++ browser/components/shell/src/nsGNOMEShellService.cpp -@@ -133,7 +133,11 @@ +diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp +--- a/browser/components/shell/src/nsGNOMEShellService.cpp ++++ b/browser/components/shell/src/nsGNOMEShellService.cpp +@@ -129,17 +129,21 @@ nsGNOMEShellService::Init() + nsCOMPtr appPath; + rv = dirSvc->Get(NS_XPCOM_CURRENT_PROCESS_DIR, NS_GET_IID(nsILocalFile), + getter_AddRefs(appPath)); + NS_ENSURE_SUCCESS(rv, rv); + rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); NS_ENSURE_SUCCESS(rv, rv); @@ -12,4 +18,9 @@ + return NS_OK; } - NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH) + NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) + + PRBool + nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const + { +