rpms
/
firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

unwrapped plugins moved to the old location

This commit is contained in:
Martin Stransky 2007-08-06 10:33:33 +00:00
parent be713dba96
commit 15debc1757
4 changed files with 39 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
firefox-plugin-config.sh.in
View File

@ -56,8 +56,10 @@ if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
fi
MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
fi
MOZ_DIST_BIN="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
export LD_LIBRARY_PATH="$MOZ_LIB_DIR/firefox-FIREFOX_VERSION"
# Set-up installed plugins
$MOZ_DIST_BIN/plugin-configuration -c -f -q > /dev/null 2>&1

15
firefox-xremote-client.sh.in
View File

@ -7,14 +7,25 @@ MOZILLA_FIVE_HOME="FFDIR"
export MOZILLA_FIVE_HOME
##
## Select the propper plugin dir
## Wrapped plug-ins are located in /lib/mozilla/plugins-wrapped
##
if [ -x "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
then
MOZ_PLUGIN_DIR="plugins-wrapped"
else
MOZ_PLUGIN_DIR="plugins"
fi
##
## Set LD_LIBRARY_PATH
##
if [ "$LD_LIBRARY_PATH" ]
then
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR:$LD_LIBRARY_PATH
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR:$LD_LIBRARY_PATH
else
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/plugins-wrapped:LIBDIR/mozilla/plugins-wrapped:LIBDIR
LD_LIBRARY_PATH=$MOZILLA_FIVE_HOME:$MOZILLA_FIVE_HOME/$MOZ_PLUGIN_DIR:LIBDIR/mozilla/$MOZ_PLUGIN_DIR:LIBDIR
fi
export LD_LIBRARY_PATH

24
firefox.sh.in
View File

@ -71,19 +71,28 @@ 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 "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
then
MOZ_PLUGIN_DIR="plugins-wrapped"
else
MOZ_PLUGIN_DIR="plugins"
fi
##
## Make sure that we set the plugin path
##
if [ "$MOZ_PLUGIN_PATH" ]
then
MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/plugins-wrapped:$MOZ_DIST_BIN/plugins-wrapped
MOZ_PLUGIN_PATH=$MOZ_PLUGIN_PATH:$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR
else
MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/plugins-wrapped:$MOZ_DIST_BIN/plugins-wrapped
MOZ_PLUGIN_PATH=$MOZ_LIB_DIR/mozilla/$MOZ_PLUGIN_DIR:$MOZ_DIST_BIN/$MOZ_PLUGIN_DIR
fi
export MOZ_PLUGIN_PATH
##
## Set FONTCONFIG_PATH for Xft/fontconfig
##
@ -135,8 +144,13 @@ function open_compose() {
# OK, here's where all the real work gets done
# configure plug-ins
/usr/bin/firefox-plugin-config
##
## If plugins are wrapped, check them
##
if [ -x "$MOZ_LIB_DIR/nspluginwrapper/npviewer" ]
then
/usr/bin/firefox-plugin-config
fi
# check to see if there's an already running instance or not
ALREADY_RUNNING=`check_running`

5
firefox.spec
View File

@ -15,7 +15,7 @@
Summary: Mozilla Firefox Web browser.
Name: firefox
Version: 2.0.0.6
Release: 1%{?dist}
Release: 2%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPL/LGPL
Group: Applications/Internet
@ -464,6 +464,9 @@ fi
#---------------------------------------------------------------------
%changelog
* Mon Aug 6 2007 Martin Stransky <stransky@redhat.com> 2.0.0.6-2
- unwrapped plugins moved to the old location
* Sat Aug 4 2007 Christopher Aillon <caillon@redhat.com> 2.0.0.6-1
- Update to 2.0.0.6
- Fix dnd support to/from gtk2 apps