# HG changeset patch # User Wolfgang Rosenauer # Date 1342424973 -7200 # Node ID 21aea6bec3cbd7ed9c995a02e247bdf266c0465a # Parent c0088c242dabc1bb3e05668ccfdb5302e34e5d7f 14.0.1 (build1) release diff -r c0088c242dab -r 21aea6bec3cb MozillaFirefox/MozillaFirefox.changes --- a/MozillaFirefox/MozillaFirefox.changes Tue Jun 26 23:24:29 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.changes Mon Jul 16 09:49:33 2012 +0200 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Mon Jun 25 19:16:07 UTC 2012 - wr@rosenauer.org - -- update to 14.0b9 +Sat Jul 14 19:31:51 UTC 2012 - wr@rosenauer.org + +- update to 14.0.1 (bnc#) - license change from tri license to MPL-2.0 - fix crashreporter restart option (bmo#762780) - reenabled mozilla-yarr-pcre.patch to fix build for PPC diff -r c0088c242dab -r 21aea6bec3cb MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Tue Jun 26 23:24:29 2012 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Mon Jul 16 09:49:33 2012 +0200 @@ -17,9 +17,9 @@ # -%define major 13 -%define mainver %major.99 -%define update_channel beta +%define major 14 +%define mainver %major.0.1 +%define update_channel release Name: MozillaFirefox BuildRequires: Mesa-devel @@ -54,7 +54,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2012062500 +%define releasedate 2012071300 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -167,7 +167,7 @@ %package translations-other Summary: Extra translations for MozillaFirefox Group: System/Localization -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} diff -r c0088c242dab -r 21aea6bec3cb MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Tue Jun 26 23:24:29 2012 +0200 +++ b/MozillaFirefox/create-tar.sh Mon Jul 16 09:49:33 2012 +0200 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="beta" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0b9_RELEASE" -VERSION="13.99" +RELEASE_TAG="FIREFOX_14_0_1_RELEASE" +VERSION="14.0.1" # mozilla echo "cloning $BRANCH..." diff -r c0088c242dab -r 21aea6bec3cb mozilla-prefer_plugin_pref.patch --- a/mozilla-prefer_plugin_pref.patch Tue Jun 26 23:24:29 2012 +0200 +++ b/mozilla-prefer_plugin_pref.patch Mon Jul 16 09:49:33 2012 +0200 @@ -4,7 +4,7 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1581,19 +1581,47 @@ nsPluginHost::FindPluginForType(const ch +@@ -1561,17 +1561,45 @@ nsPluginHost::FindPluginForType(const ch bool aCheckEnabled) { if (!aMimeType) { @@ -20,15 +20,13 @@ + nsAdoptingCString pluginPath = Preferences::GetCString(mimetypePrefChar); + preferredPluginPath = (char*) pluginPath.get(); + - InfallibleTArray matchingPlugins; - nsPluginTag *plugin = mPlugins; + + if(preferredPluginPath) { + while (nsnull != plugin) { + if (0 == PL_strcasecmp(plugin->mFileName.get(), preferredPluginPath) || + 0 == PL_strcasecmp(plugin->mFullPath.get(), preferredPluginPath)) { -+ matchingPlugins.AppendElement(plugin); ++ return plugin; + } + plugin = plugin->mNext; + } @@ -38,7 +36,7 @@ + while (nsnull != plugin) { + if (nsnull != PL_strstr(plugin->mFileName.get(), preferredPluginPath) || + nsnull != PL_strstr(plugin->mFullPath.get(), preferredPluginPath)) { -+ matchingPlugins.AppendElement(plugin); ++ return plugin; + } + plugin = plugin->mNext; + } @@ -49,6 +47,6 @@ PRInt32 mimeCount = plugin->mMimeTypes.Length(); for (PRInt32 i = 0; i < mimeCount; i++) { if (0 == PL_strcasecmp(plugin->mMimeTypes[i].get(), aMimeType)) { - matchingPlugins.AppendElement(plugin); - break; + return plugin; } + } diff -r c0088c242dab -r 21aea6bec3cb xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Tue Jun 26 23:24:29 2012 +0200 +++ b/xulrunner/create-tar.sh Mon Jul 16 09:49:33 2012 +0200 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="beta" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_14_0b9_RELEASE" -VERSION="13.99" +RELEASE_TAG="FIREFOX_14_0_1_RELEASE" +VERSION="14.0.1" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff -r c0088c242dab -r 21aea6bec3cb xulrunner/xulrunner.changes --- a/xulrunner/xulrunner.changes Tue Jun 26 23:24:29 2012 +0200 +++ b/xulrunner/xulrunner.changes Mon Jul 16 09:49:33 2012 +0200 @@ -1,7 +1,7 @@ ------------------------------------------------------------------- -Thu Jun 14 07:20:01 UTC 2012 - wr@rosenauer.org +Sat Jul 14 19:33:44 UTC 2012 - wr@rosenauer.org -- update to 14.0b7 +- update to 14.0.1 (bnc#) - license change from tri license to MPL-2.0 - require NSS 3.13.5 diff -r c0088c242dab -r 21aea6bec3cb xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Tue Jun 26 23:24:29 2012 +0200 +++ b/xulrunner/xulrunner.spec Mon Jul 16 09:49:33 2012 +0200 @@ -44,12 +44,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.9.0 BuildRequires: mozilla-nss-devel >= 3.13.5 -Version: 13.99 +Version: 14.0.1 Release: 0 -%define releasedate 2012062500 -%define version_internal 14.0 +%define releasedate 2012071300 +%define version_internal 14.0.1 %define apiversion 14 -%define uaweight 1400000 +%define uaweight 1400001 Summary: Mozilla Runtime Environment License: MPL-2.0 Group: Productivity/Other @@ -160,7 +160,7 @@ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} -Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lij;lt;lv;mai;mk;ml;mn;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;sw;ta;ta_LK;te;th;tr;uk;vi;zu) +Provides: locale(%{name}:af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;el;en_ZA;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;lij;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -470,6 +470,7 @@ %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub %{_libdir}/xulrunner-%{version_internal}/platform.ini %{_libdir}/xulrunner-%{version_internal}/omni.ja +%{_libdir}/xulrunner-%{version_internal}/README.xulrunner # crashreporter files %if %crashreporter %{_libdir}/xulrunner-%{version_internal}/crashreporter @@ -496,7 +497,6 @@ %files devel %defattr(-,root,root) -%{_libdir}/xulrunner-%{version_internal}/xpcshell %{_libdir}/xulrunner-devel-%{version_internal}/ # FIXME symlink dynamic libs below sdk/lib %attr(644,root,root) %{_libdir}/pkgconfig/*