Firefox: Fixed extension compatibility dialog

3 files changed, 14 insertions, 6 deletions

diff --git a/firefox-15.0-enable-addons.patch b/firefox-15.0-enable-addons.patch
index 648976d..a292f6c 100644
--- a/firefox-15.0-enable-addons.patch
+++ b/firefox-15.0-enable-addons.patch
@@ -1,15 +1,17 @@
-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
+diff -up firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons firefox-21.0/mozilla-release/browser/app/profile/firefox.js
+--- firefox-21.0/mozilla-release/browser/app/profile/firefox.js.addons	2013-05-11 21:19:20.000000000 +0200
++++ firefox-21.0/mozilla-release/browser/app/profile/firefox.js	2013-05-16 12:02:13.840660585 +0200
+@@ -61,7 +61,8 @@ 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);
++pref("extensions.showMismatchUI", false);
  
  // Dictionary download preference
  pref("browser.dictionaries.download.url", "https://addons.mozilla.org/%LOCALE%/firefox/dictionaries/");
+diff -up firefox-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm.addons firefox-21.0/mozilla-release/toolkit/mozapps/extensions/XPIProvider.jsm
 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
diff --git a/firefox-redhat-default-prefs.js b/firefox-redhat-default-prefs.js
index 1b07ed4..71edf1e 100644
--- a/firefox-redhat-default-prefs.js
+++ b/firefox-redhat-default-prefs.js
@@ -9,7 +9,6 @@ pref("browser.shell.checkDefaultBrowser",   false);
 pref("network.manage-offline-status",       true);
 pref("dom.ipc.plugins.enabled.nswrapper*",  false);
 pref("extensions.shownSelectionUI",         true);
-pref("extensions.autoDisableScope",         0);
 pref("gfx.color_management.enablev4",       true);
 pref("ui.SpellCheckerUnderlineStyle",       1);
 pref("startup.homepage_override_url",       "");
diff --git a/firefox.spec b/firefox.spec
index 76f4607..4e34c28 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -79,7 +79,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        21.0
-Release:        1%{?pre_tag}%{?dist}
+Release:        3%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -519,6 +519,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Thu May 16 2013 Remi Collet <RPMS@FamilleCollet.com> - 21.0-3
+- pull changes from rawhide:
+  Fixed extension compatibility dialog (rhbz#963422)
+
+* Thu May 16 2013 Martin Stransky <stransky@redhat.com> - 21.0-3
+- Fixed extension compatibility dialog (rhbz#963422)
+
 * Wed May 15 2013 Remi Collet <RPMS@FamilleCollet.com> - 21.0-1
 - Update to 21.0
 - use python27 SCL for EL-6 build