From ac830f92a701f1053c166f8ab0b68015b6a8d956376041202b70ea6fcb3b14da Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 23 Nov 2009 21:32:37 +0000 Subject: [PATCH 1/4] fix fuzz OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=131 --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 2 +- credits.patch | 21 +++++++++++++++------ 3 files changed, 21 insertions(+), 7 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 59a5295..7b66da7 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 23 22:31:21 CET 2009 - wr@rosenauer.org + +- rebased credits.patch for fuzz=0 + ------------------------------------------------------------------- Thu Nov 5 19:49:33 UTC 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index c4e80e3..bdfe332 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -160,7 +160,7 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch14 +%patch14 -p1 %patch17 %build 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; +
    + + +
    From 1c5dacba2cda0b8051d3f093432d3202b55bb326bc3912b41628ae213ff6e14a Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 24 Nov 2009 06:33:07 +0000 Subject: [PATCH 2/4] fix fuzz OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=132 --- MozillaFirefox.changes | 2 +- MozillaFirefox.spec | 2 +- firefox-appname.patch | 19 +++++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 7b66da7..fdfa407 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Nov 23 22:31:21 CET 2009 - wr@rosenauer.org -- rebased credits.patch for fuzz=0 +- 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 bdfe332..831af3b 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -161,7 +161,7 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch9 -p1 %patch10 -p1 %patch14 -p1 -%patch17 +%patch17 -p1 %build export MOZ_BUILD_DATE=%{releasedate} 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 + { + From 380b80ce7dfb187a69a8e542fd36c0ddef1f9becbe609d91f342052cd65482a3 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Wed, 25 Nov 2009 13:59:32 +0000 Subject: [PATCH 3/4] checked in OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=133 --- MozillaFirefox.changes | 5 ----- MozillaFirefox.spec | 4 ++-- credits.patch | 21 ++++++--------------- firefox-appname.patch | 19 ++++--------------- 4 files changed, 12 insertions(+), 37 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index fdfa407..59a5295 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -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 831af3b..c4e80e3 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -160,8 +160,8 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch14 -p1 -%patch17 -p1 +%patch14 +%patch17 %build export MOZ_BUILD_DATE=%{releasedate} diff --git a/credits.patch b/credits.patch index 383540f..1795952 100644 --- a/credits.patch +++ b/credits.patch @@ -1,23 +1,14 @@ -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
    • +Index: browser/base/content/credits.xhtml +================================================================================ +--- browser/base/content/credits.xhtml ++++ browser/base/content/credits.xhtml +@@ -431,6 +431,9 @@
  • Kohei Yoshino
    • -
  • Shigeru Yoshitake
  • Boris Zbarsky
    • -
  • Marco Zehe
    • -
  • Matthew Zeier
    • + +

    openSUSE RPM packaging

    +
    • Wolfgang Rosenauer
    -
    - &credit.translation; -
    + &credit.translation;
    - - -
    diff --git a/firefox-appname.patch b/firefox-appname.patch index 88e8daa..4556b8d 100644 --- a/firefox-appname.patch +++ b/firefox-appname.patch @@ -1,12 +1,6 @@ -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); - +--- browser/components/shell/src/nsGNOMEShellService.cpp ++++ browser/components/shell/src/nsGNOMEShellService.cpp +@@ -133,7 +133,11 @@ rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME)); NS_ENSURE_SUCCESS(rv, rv); @@ -18,9 +12,4 @@ diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/comp + return NS_OK; } - NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) - - PRBool - nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const - { - + NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH) From 8c10f1c230858a1df7350a81ad9db889bc819cf1201d84627e1e919636dbe146 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Wed, 25 Nov 2009 13:59:34 +0000 Subject: [PATCH 4/4] Updating link to change in openSUSE:Factory/MozillaFirefox revision 73.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=70994431c09d21f4b747e306424422cd --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 6 +++--- credits.patch | 21 +++++++++++++++------ firefox-appname.patch | 19 +++++++++++++++---- 4 files changed, 38 insertions(+), 13 deletions(-) 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

    +
    • Wolfgang Rosenauer
    - &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 + { +