diff options
| -rw-r--r-- | firefox.sh.in | 21 | ||||
| -rw-r--r-- | firefox.spec | 5 |
2 files changed, 6 insertions, 20 deletions
diff --git a/firefox.sh.in b/firefox.sh.in index 98a8b0c..a310721 100644 --- a/firefox.sh.in +++ b/firefox.sh.in @@ -83,19 +83,10 @@ MOZILLA_FIVE_HOME="$MOZ_DIST_BIN" export MOZILLA_FIVE_HOME ## -## Select the propper plugin dir -## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped -## -if [ -x "/usr/bin/mozilla-plugin-config" ] -then - MOZ_PLUGIN_DIR="plugins-wrapped" -else - MOZ_PLUGIN_DIR="plugins" -fi - -## ## Make sure that we set the plugin path ## +MOZ_PLUGIN_DIR="plugins" + if [ "$MOZ_PLUGIN_PATH" ] then MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR @@ -110,14 +101,6 @@ export MOZ_PLUGIN_PATH export MOZ_APP_LAUNCHER="/usr/bin/firefox" ## -## If plugins are wrapped, check them -## -if [ -x "/usr/bin/mozilla-plugin-config" ] -then - /usr/bin/mozilla-plugin-config -fi - -## ## Set FONTCONFIG_PATH for Xft/fontconfig ## FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft" diff --git a/firefox.spec b/firefox.spec index afec1fa..21b8155 100644 --- a/firefox.spec +++ b/firefox.spec @@ -86,7 +86,7 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 42.0 -Release: 4%{?pre_tag}%{?dist} +Release: 5%{?pre_tag}%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -762,6 +762,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Dec 7 2015 Martin Stransky <stransky@redhat.com> - 42.0-5 +- Removed nspluginwrapper support (rhbz#1289053) + * Tue Dec 1 2015 Tom Callaway <spot@fedoraproject.org> - 42.0-4 - rebuild for libvpx 1.5.0 |