diff options
| -rw-r--r-- | firefox-15.0-enable-addons.patch | 26 | ||||
| -rw-r--r-- | firefox-8.0-enable-addons.patch | 26 | ||||
| -rw-r--r-- | firefox.spec | 7 |
3 files changed, 31 insertions, 28 deletions
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 0514463..b117886 100644 --- a/firefox.spec +++ b/firefox.spec @@ -33,14 +33,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} @@ -73,7 +76,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 Patch20: mozilla-750620.patch @@ -394,7 +397,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Mon Aug 27 2012 Martin Stransky <stransky@redhat.com> - 15.0-1 -- update 15.0 +- Update to 15.0 * Wed Aug 22 2012 Dan Horák <dan[at]danny.cz> - 14.0.1-3 - add fix for secondary arches from xulrunner |