rpms/nspluginwrapper/devel nspluginwrapper.spec, 1.30, 1.31 plugin-config.sh.in, 1.4, 1.5

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	nspluginwrapper.spec plugin-config.sh.in 
Log Message:
fixed xulrunner support


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- nspluginwrapper.spec	11 Dec 2007 10:18:57 -0000	1.30
+++ nspluginwrapper.spec	13 Dec 2007 14:22:39 -0000	1.31
@@ -75,7 +75,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	15%{?dist}
+Release:	16%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -208,9 +208,7 @@
 GECKO_VERSION=`pkg-config --modversion %{gecko_flavour}-plugin`
 %endif
 
-cat %{SOURCE2} | %{__sed} -e "s|FIREFOX_VERSION|$GECKO_VERSION|g" \
-                          -e "s|USE_XPCOM|%{xpcom_support}|g" 	  \
-    > $RPM_BUILD_ROOT%{_bindir}/mozilla-plugin-config
+cat %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-plugin-config
 chmod 755 $RPM_BUILD_ROOT%{_bindir}/mozilla-plugin-config
 
 cat %{SOURCE3} | %{__sed} -e "s|EXCLUDE_LIST|%{exclude_list}|g" \
@@ -245,8 +243,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
-* Tue Dec 11 2007 Martin Stransky <stransky at redhat.com>
+* Tue Dec 13 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-16
 - spec fixes
+- fixed xulrunner support
 
 * Mon Dec 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-15
 - updated configure script - gecko selection


Index: plugin-config.sh.in
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/plugin-config.sh.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- plugin-config.sh.in	14 Aug 2007 08:38:19 -0000	1.4
+++ plugin-config.sh.in	13 Dec 2007 14:22:39 -0000	1.5
@@ -47,23 +47,6 @@
 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
-	    echo "Error: $MOZ_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
-	    if [ -d $SECONDARY_LIB_DIR ]; then
-		echo "       $SECONDARY_LIB_DIR/firefox-FIREFOX_VERSION/firefox-bin not found"
-	    fi
-	    exit 1
-	fi
-	MOZ_LIB_DIR="$SECONDARY_LIB_DIR"
-    fi
-    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