From ce324a4c96ed429ce44098a2d4751e2b2279584d Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Tue, 27 Jan 2015 20:26:14 +0100 Subject: Backed out the flash click-to-play setup --- firefox-35.0-flash-click-to-play.patch | 12 ------------ firefox.spec | 7 ++++--- 2 files changed, 4 insertions(+), 15 deletions(-) delete mode 100644 firefox-35.0-flash-click-to-play.patch diff --git a/firefox-35.0-flash-click-to-play.patch b/firefox-35.0-flash-click-to-play.patch deleted file mode 100644 index 93d218e..0000000 --- a/firefox-35.0-flash-click-to-play.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up firefox-35.0/mozilla-release/browser/app/profile/firefox.js.flash firefox-35.0/mozilla-release/browser/app/profile/firefox.js ---- firefox-35.0/mozilla-release/browser/app/profile/firefox.js.flash 2015-01-22 12:19:27.000000000 +0100 -+++ firefox-35.0/mozilla-release/browser/app/profile/firefox.js 2015-01-22 12:21:45.139134814 +0100 -@@ -691,7 +691,7 @@ pref("plugin.defaultXpi.state", 2); - - // Flash is enabled by default, and Java is click-to-activate by default on - // all channels. --pref("plugin.state.flash", 2); -+pref("plugin.state.flash", 1); - pref("plugin.state.java", 1); - - // Whitelist Requests diff --git a/firefox.spec b/firefox.spec index bd1e70f..0dbdcf2 100644 --- a/firefox.spec +++ b/firefox.spec @@ -107,7 +107,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 35.0.1 -Release: 2%{?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 @@ -140,7 +140,6 @@ Patch204: rhbz-966424.patch Patch215: firefox-enable-addons.patch Patch219: rhbz-1173156.patch Patch220: rhbz-1014858.patch -Patch221: firefox-35.0-flash-click-to-play.patch # Upstream patches Patch300: mozilla-858919.patch @@ -296,7 +295,6 @@ cd %{tarballdir} %patch215 -p1 -b .addons %patch219 -p2 -b .rhbz-1173156 %patch220 -p1 -b .rhbz-1014858 -%patch221 -p2 -b .flash # Upstream patches %patch300 -p1 -b .858919 @@ -766,6 +764,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Jan 27 2015 Martin Stransky - 35.0.1-3 +- Backed out the flash click-to-play setup + * Mon Jan 26 2015 David Tardon - 35.0.1-2 - rebuild for ICU 54.1 -- cgit