1
0

Accepting request 24938 from mozilla:Factory

Copy from mozilla:Factory/MozillaFirefox based on submit request 24938 from user wrosenauer

OBS-URL: https://build.opensuse.org/request/show/24938
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=73
This commit is contained in:
OBS User autobuild 2009-11-25 13:59:34 +00:00 committed by Git OBS Bridge
commit 3cbbb16f35
4 changed files with 38 additions and 13 deletions

View File

@ -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 Thu Nov 5 19:49:33 UTC 2009 - wr@rosenauer.org

View File

@ -29,7 +29,7 @@ License: GPL v2 or later ; LGPL v2.1 or later ; MPL 1.1 or later
Provides: web_browser Provides: web_browser
Provides: firefox Provides: firefox
Version: 3.5.5 Version: 3.5.5
Release: 1 Release: 2
Summary: Mozilla Firefox Web Browser Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/ Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers Group: Productivity/Networking/Web/Browsers
@ -160,8 +160,8 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js
%patch8 -p1 %patch8 -p1
%patch9 -p1 %patch9 -p1
%patch10 -p1 %patch10 -p1
%patch14 %patch14 -p1
%patch17 %patch17 -p1
%build %build
export MOZ_BUILD_DATE=%{releasedate} export MOZ_BUILD_DATE=%{releasedate}

View File

@ -1,14 +1,23 @@
Index: browser/base/content/credits.xhtml diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml
================================================================================ --- a/browser/base/content/credits.xhtml
--- browser/base/content/credits.xhtml +++ b/browser/base/content/credits.xhtml
+++ browser/base/content/credits.xhtml @@ -579,16 +579,19 @@
@@ -431,6 +431,9 @@ <li>Satoko Takita Yamaguchi (Chibi)</li>
<li>Christine Yen</li>
<li>Kohei Yoshino</li> <li>Kohei Yoshino</li>
<li>Shigeru Yoshitake</li>
<li>Boris Zbarsky</li> <li>Boris Zbarsky</li>
<li>Marco Zehe</li>
<li>Matthew Zeier</li>
</ul> </ul>
+ +
+ <h3>openSUSE RPM packaging</h3> + <h3>openSUSE RPM packaging</h3>
+ <ul><li>Wolfgang Rosenauer</li></ul> + <ul><li>Wolfgang Rosenauer</li></ul>
&credit.translation; <div dir="&locale.dir;">
&credit.translation;
</div>
</div> </div>
<!-- organizational supporters -->
<div class="creditsGroup">

View File

@ -1,6 +1,12 @@
--- browser/components/shell/src/nsGNOMEShellService.cpp diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
+++ browser/components/shell/src/nsGNOMEShellService.cpp --- a/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -133,7 +133,11 @@ +++ b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -129,17 +129,21 @@ nsGNOMEShellService::Init()
nsCOMPtr<nsILocalFile> 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)); rv = appPath->AppendNative(NS_LITERAL_CSTRING(MOZ_APP_NAME));
NS_ENSURE_SUCCESS(rv, rv); NS_ENSURE_SUCCESS(rv, rv);
@ -12,4 +18,9 @@
+ return NS_OK; + 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
{