--- a/MozillaFirefox/MozillaFirefox.spec Mon Aug 02 08:49:38 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Wed Aug 04 23:59:00 2010 +0200
@@ -36,7 +36,7 @@
Provides: firefox
Version: 4.0b
Release: 1
-%define releasedate 2010072000
+%define releasedate 2010080300
Summary: Mozilla Firefox Web Browser
Url: http://www.mozilla.org/
Group: Productivity/Networking/Web/Browsers
--- a/firefox-credits.patch Mon Aug 02 08:49:38 2010 +0200
+++ b/firefox-credits.patch Wed Aug 04 23:59:00 2010 +0200
@@ -1,19 +1,18 @@
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 @@
- <li>Satoko Takita Yamaguchi (Chibi)</li>
- <li>Christine Yen</li>
+@@ -581,16 +581,19 @@
<li>Kohei Yoshino</li>
<li>Shigeru Yoshitake</li>
+ <li>Tanner M. Young</li>
<li>Boris Zbarsky</li>
<li>Marco Zehe</li>
<li>Matthew Zeier</li>
</ul>
-+
+
+ <h3>openSUSE RPM packaging</h3>
+ <ul><li>Wolfgang Rosenauer</li></ul>
-
++
<div dir="&locale.dir;">
&credit.translation;
</div>
@@ -21,3 +20,4 @@
<!-- organizational supporters -->
<div class="creditsGroup">
+ <h3 dir="&locale.dir;">&credit.thanks;</h3>
--- a/mozilla-prefer_plugin_pref.patch Mon Aug 02 08:49:38 2010 +0200
+++ b/mozilla-prefer_plugin_pref.patch Wed Aug 04 23:59:00 2010 +0200
@@ -4,10 +4,15 @@
diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp
--- a/modules/plugin/base/src/nsPluginHost.cpp
+++ b/modules/plugin/base/src/nsPluginHost.cpp
-@@ -3929,8 +3929,41 @@ nsPluginHost::FindPluginForType(const ch
+@@ -1620,17 +1620,47 @@ nsPluginHost::FindPluginForType(const ch
+ nsPluginTag *plugins = nsnull;
+ PRInt32 variants, cnt;
+
+ LoadPlugins();
+
// if we have a mimetype passed in, search the mPlugins
// linked list for a match
- if (nsnull != aMimeType) {
+ if (aMimeType) {
+ nsresult res;
+ nsCOMPtr<nsIPrefBranch> prefB (do_QueryInterface(mPrefService));
+
@@ -20,7 +25,6 @@
+ if(!NS_SUCCEEDED(res)) preferredPluginPath = NULL;
+
plugins = mPlugins;
--
+ if(preferredPluginPath) {
+ while (nsnull != plugins) {
+ if (0 == PL_strcasecmp(plugins->mFileName.get(), preferredPluginPath) ||
@@ -40,10 +44,11 @@
+ plugins = plugins->mNext;
+ }
+ }
-+
-+ // if there is no pref for this mime-type, or if the plugin named in pref
-+ // isn't found, we pick the first that matches for this mime-type
-+ plugins = mPlugins;
- while (nsnull != plugins) {
+
+ while (plugins) {
variants = plugins->mVariants;
for (cnt = 0; cnt < variants; cnt++) {
+ if ((!aCheckEnabled || plugins->IsEnabled()) &&
+ plugins->mMimeTypeArray[cnt] &&
+ (0 == PL_strcasecmp(plugins->mMimeTypeArray[cnt], aMimeType))) {
+ return plugins;
--- a/mozilla-xulrunner20/create-tar.sh Mon Aug 02 08:49:38 2010 +0200
+++ b/mozilla-xulrunner20/create-tar.sh Wed Aug 04 23:59:00 2010 +0200
@@ -1,7 +1,7 @@
#!/bin/bash
BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b2_RELEASE"
+RELEASE_TAG="FIREFOX_4_0b3_RELEASE"
VERSION="2.0b"
# mozilla
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec Mon Aug 02 08:49:38 2010 +0200
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec Wed Aug 04 23:59:00 2010 +0200
@@ -35,8 +35,8 @@
License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
Version: 2.0b
Release: 1
-%define releasedate 2010072000
-%define version_internal 2.0b2
+%define releasedate 2010080300
+%define version_internal 2.0b3
%define apiversion 2.0
%define uaweight 199900
Summary: Mozilla Runtime Environment 2.0