rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-xulrunner.patch, NONE, 1.1 nspluginwrapper.spec, 1.25, 1.26

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	nspluginwrapper.spec 
Added Files:
	nspluginwrapper-0.9.91.5-xulrunner.patch 
Log Message:
rebuilt agains xulrunner

nspluginwrapper-0.9.91.5-xulrunner.patch:

--- NEW FILE nspluginwrapper-0.9.91.5-xulrunner.patch ---
diff -up nspluginwrapper-0.9.91.5/configure.xl nspluginwrapper-0.9.91.5/configure
--- nspluginwrapper-0.9.91.5/configure.xl	2007-11-23 14:51:25.000000000 +0100
+++ nspluginwrapper-0.9.91.5/configure	2007-11-23 14:51:36.000000000 +0100
@@ -244,9 +244,9 @@ EOF
 #fi
 
 # check for Gecko compile CFLAGS
-if $pkgconfig --exists firefox-plugin; then
-    GECKO_CFLAGS=`$pkgconfig --cflags firefox-plugin`
-    GECKO_LDFLAGS=`$pkgconfig --libs firefox-plugin`
+if $pkgconfig --exists xulrunner-plugin; then
+    GECKO_CFLAGS=`$pkgconfig --cflags xulrunner-plugin`
+    GECKO_LDFLAGS=`$pkgconfig --libs xulrunner-plugin`
     GECKO_LIBDIR=""
 else
     echo "gecko-devel not found"
@@ -255,10 +255,10 @@ fi
 
 # check for XPCOM compile CFLAGS
 if [ $with_xpcom == "yes" ]; then
-    if $pkgconfig --exists firefox-xpcom; then
-	GECKO_CFLAGS="$GECKO_CFLAGS"`$pkgconfig --cflags firefox-xpcom`
-        GECKO_LDFLAGS="$GECKO_LDFLAGS"`$pkgconfig --libs firefox-xpcom`
-	GECKO_LIBDIR="$GECKO_LIBDIR"`$pkgconfig --libs-only-L firefox-xpcom | sed -e "s|-L||" -e "s| ||g"`
+    if $pkgconfig --exists xulrunner-xpcom; then
+	GECKO_CFLAGS="$GECKO_CFLAGS"`$pkgconfig --cflags xulrunner-xpcom`
+        GECKO_LDFLAGS="$GECKO_LDFLAGS"`$pkgconfig --libs xulrunner-xpcom`
+	GECKO_LIBDIR="$GECKO_LIBDIR"`$pkgconfig --libs-only-L xulrunner-xpcom | sed -e "s|-L||" -e "s| ||g"`
     else
 	echo "gecko-devel (XPCOM) not found"
         exit 1


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nspluginwrapper.spec	23 Nov 2007 13:43:49 -0000	1.25
+++ nspluginwrapper.spec	23 Nov 2007 14:02:39 -0000	1.26
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	12%{?dist}
+Release:	13%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -80,7 +80,8 @@
 Patch2:         nspluginwrapper-0.9.91.5-rh.patch
 Patch4:         nspluginwrapper-0.9.91.5-runtime-restart.patch
 Patch5:         nspluginwrapper-0.9.91.5-fork.patch
-Patch6:         plugin-config-setuid.patch
+Patch6:         nspluginwrapper-0.9.91.5-xulrunner.patch
+Patch10:        plugin-config-setuid.patch
 License:	GPL
 Group:		Networking/WWW
 Url:		http://gwenole.beauchesne.info/projects/nspluginwrapper/
@@ -113,9 +114,10 @@
 %patch2 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1 -b .xl
 
 pushd %plugin_config_name
-%patch6 -p2
+%patch10 -p2
 popd
 
 # remove old/incompatibile stuff
@@ -195,7 +197,7 @@
 
 rm -rf $RPM_BUILD_ROOT/usr/doc/plugin-config
 
-GECKO_VERSION=`pkg-config --modversion firefox-plugin`
+GECKO_VERSION=`pkg-config --modversion xulrunner-plugin`
 
 cat %{SOURCE2} | %{__sed} -e "s|FIREFOX_VERSION|$GECKO_VERSION|g" \
                           -e "s|USE_XPCOM|%{xpcom_support}|g" 	  \
@@ -234,6 +236,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Fri Nov 23 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-13
+- rebuilt against xulrunner
+
 * Tue Nov 6 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-12
 - more fixes from review by security standards team