From 579b63ae145910fe7d404f1123b291c4c1016096 Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 28 Aug 2012 13:41:27 +0200 Subject: Xulrunner / Firefox 15.0 --- firefox-15.0-enable-addons.patch | 26 ++++++++++++++++++++++++++ firefox-8.0-enable-addons.patch | 26 -------------------------- firefox.spec | 33 ++++++++++++++++++++++++--------- 3 files changed, 50 insertions(+), 35 deletions(-) create mode 100644 firefox-15.0-enable-addons.patch delete mode 100644 firefox-8.0-enable-addons.patch diff --git a/firefox-15.0-enable-addons.patch b/firefox-15.0-enable-addons.patch new file mode 100644 index 0000000..648976d --- /dev/null +++ b/firefox-15.0-enable-addons.patch @@ -0,0 +1,26 @@ +diff -up firefox-15.0/mozilla-beta/browser/app/profile/firefox.js.addons firefox-15.0/mozilla-beta/browser/app/profile/firefox.js +--- firefox-15.0/mozilla-beta/browser/app/profile/firefox.js.addons 2012-08-15 07:47:02.000000000 +0200 ++++ firefox-15.0/mozilla-beta/browser/app/profile/firefox.js 2012-08-21 11:57:35.333981299 +0200 +@@ -61,7 +61,7 @@ pref("extensions.hotfix.certs.1.sha1Fing + + // Disable add-ons that are not installed by the user in all scopes by default. + // See the SCOPE constants in AddonManager.jsm for values to use here. +-pref("extensions.autoDisableScopes", 15); ++pref("extensions.autoDisableScopes", 0); + + // Dictionary download preference + pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); +diff -up firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm +--- firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2012-08-15 07:48:32.000000000 +0200 ++++ firefox-15.0/mozilla-beta/toolkit/mozapps/extensions/XPIProvider.jsm 2012-08-21 11:56:41.441980035 +0200 +@@ -1630,8 +1630,8 @@ var XPIProvider = { + this.showUpgradeUI(); + flushCaches = true; + } +- else if (aAppChanged === undefined) { +- // For new profiles we will never need to show the add-on selection UI ++ else { ++ // For all profiles we will never need to show the add-on selection UI + Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); + } + diff --git a/firefox-8.0-enable-addons.patch b/firefox-8.0-enable-addons.patch deleted file mode 100644 index 795b082..0000000 --- a/firefox-8.0-enable-addons.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff -up firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-8.0/mozilla-release/browser/app/profile/firefox.js ---- firefox-8.0/mozilla-release/browser/app/profile/firefox.js.addons 2011-11-04 22:33:52.000000000 +0100 -+++ firefox-8.0/mozilla-release/browser/app/profile/firefox.js 2011-11-15 10:35:31.446869396 +0100 -@@ -77,7 +77,7 @@ pref("extensions.update.autoUpdateDefaul - // Disable add-ons installed into the shared user and shared system areas by - // default. This does not include the application directory. See the SCOPE - // constants in AddonManager.jsm for values to use here --pref("extensions.autoDisableScopes", 15); -+pref("extensions.autoDisableScopes", 0); - - // Dictionary download preference - pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/"); -diff -up firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm ---- firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons 2011-11-04 22:34:18.000000000 +0100 -+++ firefox-8.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm 2011-11-15 10:42:17.866426274 +0100 -@@ -1591,8 +1591,8 @@ var XPIProvider = { - this.showUpgradeUI(); - flushCaches = true; - } -- else if (aAppChanged === undefined) { -- // For new profiles we will never need to show the add-on selection UI -+ else { -+ // For all profiles we will never need to show the add-on selection UI - Services.prefs.setBoolPref(PREF_SHOWN_SELECTION_UI, true); - } - diff --git a/firefox.spec b/firefox.spec index bc47330..32a2ef1 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,9 +1,12 @@ # Use system nspr/nss? -%if 0%{?fedora} < 15 +%if 0%{?fedora} < 15 && 0%{?rhel} < 6 %define system_nss 0 -%define system_vpx 0 %else %define system_nss 1 +%endif +%if 0%{?fedora} < 15 +%define system_vpx 0 +%else %define system_vpx 1 %endif @@ -25,13 +28,13 @@ #global shortname firefox #global mycomment Beta 4 -%global firefox_dir_ver 14 -%global xulrunner_version 14.0.1 +%global firefox_dir_ver 15 +%global xulrunner_version 15.0 %global xulrunner_release 1 %global alpha_version 0 %global beta_version 0 %global rc_version 0 -%global datelang 20120724 +%global datelang 20120827 %global mozappdir %{_libdir}/firefox %global langpackdir %{mozappdir}/langpacks @@ -44,14 +47,17 @@ %if %{alpha_version} > 0 %global pre_version a%{alpha_version} %global pre_name alpha%{alpha_version} +%global tarballdir mozilla-alpha %endif %if %{beta_version} > 0 %global pre_version b%{beta_version} %global pre_name beta%{beta_version} +%global tarballdir mozilla-beta %endif %if %{rc_version} > 0 %global pre_version rc%{rc_version} %global pre_name rc%{rc_version} +%global tarballdir mozilla-release %endif %if %{defined pre_version} %global xulrunner_verrel %{xulrunner_version}-%{xulrunner_release}%{pre_name} @@ -62,14 +68,14 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 14.0.1 +Version: 15.0 Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2 %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-%{datelang}.tar.bz2 +Source1: firefox-langpacks-%{version}%{?pre_version}-%{datelang}.tar.xz %endif Source10: firefox-mozconfig Source11: firefox-mozconfig-branded @@ -84,7 +90,7 @@ Patch0: firefox-install-dir.patch # Fedora patches Patch14: firefox-5.0-asciidel.patch -Patch15: firefox-8.0-enable-addons.patch +Patch15: firefox-15.0-enable-addons.patch # Upstream patches @@ -119,7 +125,7 @@ compliance, performance and portability. #--------------------------------------------------------------------- %prep -echo TARGET = %{name}-%{version}-%{release}%{?dist} +echo TARGET = %{name}-%{version}-%{release} %if %{build_langpacks} [ -f %{SOURCE1} ] || exit 1 %endif @@ -456,6 +462,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Aug 28 2012 Remi Collet - 15.0-1 +- Sync with rawhide, update to 15.0 + +* Mon Aug 27 2012 Martin Stransky - 15.0-1 +- Update to 15.0 + +* Wed Aug 22 2012 Dan Horák - 14.0.1-3 +- add fix for secondary arches from xulrunner + * Wed Aug 1 2012 Martin Stransky - 14.0.1-2 - removed StartupWMClass (rhbz#844860) -- cgit