rpms/firefox/devel firefox-plugin-config.sh.in, 1.1, 1.2 firefox-xremote-client.sh.in, 1.2, 1.3 firefox.sh.in, 1.20, 1.21 firefox.spec, 1.188, 1.189

Martin Stransky (stransky) fedora-extras-commits at redhat.com
Mon Aug 6 10:34:06 UTC 2007


Author: stransky

Update of /cvs/pkgs/rpms/firefox/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32024

Modified Files:
	firefox-plugin-config.sh.in firefox-xremote-client.sh.in 
	firefox.sh.in firefox.spec 
Log Message:
unwrapped plugins moved to the old location


Index: firefox-plugin-config.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-plugin-config.sh.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- firefox-plugin-config.sh.in	31 Jul 2007 10:52:57 -0000	1.1
+++ firefox-plugin-config.sh.in	6 Aug 2007 10:33:33 -0000	1.2
@@ -56,8 +56,10 @@
     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
 


Index: firefox-xremote-client.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox-xremote-client.sh.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- firefox-xremote-client.sh.in	31 Jul 2007 10:50:12 -0000	1.2
+++ firefox-xremote-client.sh.in	6 Aug 2007 10:33:33 -0000	1.3
@@ -8,13 +8,24 @@
 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
 


Index: firefox.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.sh.in,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- firefox.sh.in	31 Jul 2007 10:50:12 -0000	1.20
+++ firefox.sh.in	6 Aug 2007 10:33:33 -0000	1.21
@@ -71,19 +71,28 @@
 
 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 @@
 
 # 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`


Index: firefox.spec
===================================================================
RCS file: /cvs/pkgs/rpms/firefox/devel/firefox.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- firefox.spec	4 Aug 2007 19:37:08 -0000	1.188
+++ firefox.spec	6 Aug 2007 10:33:33 -0000	1.189
@@ -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 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Aug 6 2007 Martin Stransky <stransky at redhat.com> 2.0.0.6-2
+- unwrapped plugins moved to the old location
+
 * Sat Aug  4 2007 Christopher Aillon <caillon at redhat.com> 2.0.0.6-1
 - Update to 2.0.0.6
 - Fix dnd support to/from gtk2 apps




More information about the fedora-extras-commits mailing list