rpms/nspluginwrapper/devel nspluginwrapper.spec, 1.12, 1.13 plugin-config.sh.in, 1.3, 1.4

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	nspluginwrapper.spec plugin-config.sh.in 
Log Message:
fixed an installation script (#251698)


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- nspluginwrapper.spec	13 Aug 2007 10:59:02 -0000	1.12
+++ nspluginwrapper.spec	14 Aug 2007 08:38:19 -0000	1.13
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.4
-Release:	16%{?dist}
+Release:	17%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -219,6 +219,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Tue Aug 14 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-17
+- fixed an installation script (#251698)
+
 * Mon Aug 13 2007 Martin Stransky <stransky at redhat.com> 0.9.91.4-16
 - fixed plugins check
 - minor spec fixes


Index: plugin-config.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/plugin-config.sh.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- plugin-config.sh.in	10 Aug 2007 09:52:24 -0000	1.3
+++ plugin-config.sh.in	14 Aug 2007 08:38:19 -0000	1.4
@@ -46,6 +46,9 @@
 		;;
 esac
 
+##
+## Detect a gecko-lib instalation if it's requested
+##
 if [ "USE_XPCOM" -eq "1" ]; then
     if [ ! -x $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
 	if [ ! -x $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin ]; then
@@ -60,12 +63,28 @@
     export LD_LIBRARY_PATH=$MOZ_LIB_DIR/firefox-FIREFOX_VERSION
 fi
 
+##
+## Detect nspluginwrapper installation and prefer the native version
+##
+if [ ! -x $MOZ_LIB_DIR/nspluginwrapper/plugin-config ]; then    
+    if [ ! -x $SECONDARY_LIB_DIR/nspluginwrapper/plugin-config ]; then
+        echo "Error: $MOZ_LIB_DIR/nspluginwrapper/plugin-config not found"
+	if [ -d $SECONDARY_LIB_DIR ]; then
+	    echo "       $SECONDARY_LIB_DIR/nspluginwrapper/plugin-config not found"
+        fi
+        exit 1
+    fi
+    WRAPPER_LIB_DIR="$SECONDARY_LIB_DIR"
+else
+    WRAPPER_LIB_DIR="$MOZ_LIB_DIR"
+fi
+
 # Add system-wide configuration
 . /etc/sysconfig/nspluginwrapper
 
 # Set-up installed plugins
 if [ $# -eq 0 ]; then 
-    $MOZ_LIB_DIR/nspluginwrapper/plugin-config -f > /dev/null 2>&1
+    $WRAPPER_LIB_DIR/nspluginwrapper/plugin-config -f > /dev/null 2>&1
 else
-    $MOZ_LIB_DIR/nspluginwrapper/plugin-config $*
+    $WRAPPER_LIB_DIR/nspluginwrapper/plugin-config $*
 fi