rpms/nspluginwrapper/devel nspluginwrapper-0.9.91.5-xulrunner.patch, 1.1, 1.2 nspluginwrapper.spec, 1.28, 1.29

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	nspluginwrapper-0.9.91.5-xulrunner.patch nspluginwrapper.spec 
Log Message:
* Mon Dec 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-15
- updated configure script - gecko selection



nspluginwrapper-0.9.91.5-xulrunner.patch:

Index: nspluginwrapper-0.9.91.5-xulrunner.patch
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper-0.9.91.5-xulrunner.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nspluginwrapper-0.9.91.5-xulrunner.patch	23 Nov 2007 14:02:39 -0000	1.1
+++ nspluginwrapper-0.9.91.5-xulrunner.patch	10 Dec 2007 12:25:07 -0000	1.2
@@ -1,31 +1,61 @@
 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
+--- nspluginwrapper-0.9.91.5/configure.xl	2007-12-10 13:17:00.000000000 +0100
++++ nspluginwrapper-0.9.91.5/configure	2007-12-10 13:20:42.000000000 +0100
+@@ -33,6 +33,7 @@ target_os="linux"
+ target_cpu="i386"
+ bigendian="no"
+ with_xpcom="no"
++with_gecko="mozilla"
+ 
+ # find source path
+ # XXX: we assume an absolute path is given when launching configure, 
+@@ -86,6 +87,9 @@ case "$opt" in
+ --with-xpcom=*)
+     with_xpcom=`echo $opt | cut -d '=' -f 2`
+     ;;
++--with-gecko=*)
++    with_gecko=`echo $opt | cut -d '=' -f 2`
++    ;;
+ esac
+ done
+ 
+@@ -244,21 +248,22 @@ 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`
++if $pkgconfig --exists $with_gecko-plugin; then
++    GECKO_CFLAGS=`$pkgconfig --cflags $with_gecko-plugin`
++    GECKO_LDFLAGS=`$pkgconfig --libs $with_gecko-plugin`
      GECKO_LIBDIR=""
  else
      echo "gecko-devel not found"
-@@ -255,10 +255,10 @@ fi
+     exit 1
+ 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"`
++    if $pkgconfig --exists $with_gecko-xpcom; then
++	GECKO_CFLAGS="$GECKO_CFLAGS"`$pkgconfig --cflags $with_gecko-xpcom`
++        GECKO_LDFLAGS="$GECKO_LDFLAGS"`$pkgconfig --libs $with_gecko-xpcom`
++	GECKO_LIBDIR="$GECKO_LIBDIR"`$pkgconfig --libs-only-L $with_gecko-xpcom | sed -e "s|-L||" -e "s| ||g"`
      else
  	echo "gecko-devel (XPCOM) not found"
          exit 1
+@@ -406,7 +411,8 @@ echo "C++ compiler              $cxx"
+ echo "host big endian           $bigendian"
+ echo "target OS                 $target_os"
+ echo "target CPU                $target_cpu"
+-echo "XPCOM support             $with_xpcom"
++echo "Gecko                     $with_gecko"
++echo "Gecko XPCOM support       $with_xpcom"
+ 
+ config_mak="config-host.mak"
+ echo "# Automatically generated by configure - do not modify" > $config_mak


Index: nspluginwrapper.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nspluginwrapper/devel/nspluginwrapper.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- nspluginwrapper.spec	6 Dec 2007 12:31:48 -0000	1.28
+++ nspluginwrapper.spec	10 Dec 2007 12:25:07 -0000	1.29
@@ -70,7 +70,7 @@
 Summary:	A compatibility layer for Netscape 4 plugins
 Name:		nspluginwrapper
 Version:	0.9.91.5
-Release:	14%{?dist}
+Release:	15%{?dist}
 Source0:	%{name}-%{version}%{?svndate:-%{svndate}}.tar.bz2
 Source1:        %{plugin_config_name}.tar.gz 
 Source2:        plugin-config.sh.in
@@ -159,7 +159,8 @@
 	    --with-base-lib=%{lib}		\
 	    --with-xpcom="$XPCOM_SUPPORT"	\
 	    --with-base-libdir=%{libdir}	\
-	    --with-x11-prefix=/usr	    
+	    --with-x11-prefix=/usr	        \
+	    --with-gecko=xulrunner
 	    
 make
 popd
@@ -232,6 +233,9 @@
 %{_sysconfdir}/sysconfig/%{name}
 
 %changelog
+* Mon Dec 10 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-15
+- updated configure script - gecko selection
+
 * Thu Dec 06 2007 Martin Stransky <stransky at redhat.com> 0.9.91.5-14
 - enabled xpcom support
 - added fix for #393541 - scripts will never fail