1
0
OBS User autobuild 2009-11-25 13:59:32 +00:00 committed by Git OBS Bridge
parent 1c5dacba2c
commit 380b80ce7d
4 changed files with 12 additions and 37 deletions

View File

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

View File

@ -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 -p1 %patch14
%patch17 -p1 %patch17
%build %build
export MOZ_BUILD_DATE=%{releasedate} export MOZ_BUILD_DATE=%{releasedate}

View File

@ -1,23 +1,14 @@
diff --git a/browser/base/content/credits.xhtml b/browser/base/content/credits.xhtml Index: browser/base/content/credits.xhtml
--- a/browser/base/content/credits.xhtml ================================================================================
+++ b/browser/base/content/credits.xhtml --- browser/base/content/credits.xhtml
@@ -579,16 +579,19 @@ +++ browser/base/content/credits.xhtml
<li>Satoko Takita Yamaguchi (Chibi)</li> @@ -431,6 +431,9 @@
<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>
<div dir="&locale.dir;">
&credit.translation; &credit.translation;
</div> </div>
</div>
<!-- organizational supporters -->
<div class="creditsGroup">

View File

@ -1,12 +1,6 @@
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 +++ browser/components/shell/src/nsGNOMEShellService.cpp
+++ b/browser/components/shell/src/nsGNOMEShellService.cpp @@ -133,7 +133,11 @@
@@ -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);
@ -18,9 +12,4 @@ diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/comp
+ return NS_OK; + return NS_OK;
} }
NS_IMPL_ISUPPORTS1(nsGNOMEShellService, nsIShellService) NS_IMPL_ISUPPORTS2(nsGNOMEShellService, nsIShellService, nsIShellService_MOZILLA_1_8_BRANCH)
PRBool
nsGNOMEShellService::KeyMatchesAppName(const char *aKeyValue) const
{