rpms/xulrunner/devel mozilla-xulrunner-pkgconfig.patch, 1.1, 1.2 xulrunner.spec, 1.29, 1.30

[Martin Stransky (stransky)]

Author: stransky

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

Modified Files:
	mozilla-xulrunner-pkgconfig.patch xulrunner.spec 
Log Message:
added xulrunner/js include dir to xulrunner-js

mozilla-xulrunner-pkgconfig.patch:

Index: mozilla-xulrunner-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-xulrunner-pkgconfig.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mozilla-xulrunner-pkgconfig.patch	15 Nov 2007 17:21:05 -0000	1.1
+++ mozilla-xulrunner-pkgconfig.patch	26 Nov 2007 15:27:12 -0000	1.2
@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.old mozilla/config/autoconf.mk.in
 --- mozilla/config/autoconf.mk.in.old	2007-10-11 20:50:54.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2007-11-15 16:31:06.000000000 +0100
++++ mozilla/config/autoconf.mk.in	2007-11-26 14:18:09.000000000 +0100
 @@ -65,7 +65,7 @@ mandir		= @mandir@
  idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
  
@@ -11,8 +11,8 @@
  DIST		= $(DEPTH)/dist
  LIBXUL_SDK      = @LIBXUL_SDK@
 diff -up mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.old mozilla/xulrunner/installer/xulrunner-xpcom.pc.in
---- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -3,14 +3,15 @@ sdkdir=%sdkdir%
  includedir=%includedir%
  idldir=%idldir%
@@ -34,7 +34,7 @@
 \ No newline at end of file
 diff -up mozilla/xulrunner/installer/libxul.pc.in.old mozilla/xulrunner/installer/libxul.pc.in
 --- mozilla/xulrunner/installer/libxul.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2007-11-15 16:31:06.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -2,6 +2,7 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
@@ -52,8 +52,8 @@
  Cflags: -I${includedir}/${includetype} -fshort-wchar
 \ No newline at end of file
 diff -up mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old mozilla/xulrunner/installer/mozilla-xpcom.pc.in
---- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -2,15 +2,16 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
@@ -75,8 +75,8 @@
  Cflags: -I${includedir}/${includetype} -fshort-wchar
 \ No newline at end of file
 diff -up mozilla/xulrunner/installer/xulrunner-embedding.pc.in.old mozilla/xulrunner/installer/xulrunner-embedding.pc.in
---- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -2,14 +2,15 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
@@ -96,8 +96,8 @@
 +Libs: -L${sdkdir} -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/xulrunner-plugin.pc.in.old mozilla/xulrunner/installer/xulrunner-plugin.pc.in
---- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -1,6 +1,7 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -108,7 +108,7 @@
  Description: Mozilla Plug-In API
 diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.old mozilla/xulrunner/installer/libxul-embedding.pc.in
 --- mozilla/xulrunner/installer/libxul-embedding.pc.in.old	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2007-11-15 16:31:06.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -2,6 +2,7 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
@@ -124,9 +124,20 @@
 -Libs: -L${sdkdir}/lib -lxpcomglue
 +Libs: -L${sdkdir} -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
+diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.old mozilla/xulrunner/installer/mozilla-js.pc.in
+--- mozilla/xulrunner/installer/mozilla-js.pc.in.old	2007-11-26 14:20:04.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2007-11-26 14:20:23.000000000 +0100
+@@ -6,5 +6,5 @@ Name: JavaScript
+ Description: The Mozilla JavaScript Library
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Libs: -L${sdkdir} -lmozjs
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
 diff -up mozilla/xulrunner/installer/mozilla-embedding.pc.in.old mozilla/xulrunner/installer/mozilla-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-embedding.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-embedding.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/mozilla-embedding.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-embedding.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -2,14 +2,15 @@ prefix=%prefix%
  sdkdir=%sdkdir%
  includedir=%includedir%
@@ -146,8 +157,8 @@
 +Libs: -L${sdkdir} -lxpcomglue
  Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.old mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in	2007-11-15 16:33:40.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -5,7 +5,7 @@ idldir=%idldir%
  includetype=stable
  libdir=%sdkdir%
@@ -158,8 +169,8 @@
  Version: %MOZILLA_VERSION%
  Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
 diff -up mozilla/xulrunner/installer/xulrunner-js.pc.in.old mozilla/xulrunner/installer/xulrunner-js.pc.in
---- mozilla/xulrunner/installer/xulrunner-js.pc.in.old	2007-11-15 16:31:06.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-js.pc.in	2007-11-15 16:31:06.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-js.pc.in.old	2007-11-26 14:18:09.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-js.pc.in	2007-11-26 14:18:09.000000000 +0100
 @@ -1,10 +1,11 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -171,11 +182,12 @@
  Version: %MOZILLA_VERSION%
  Requires: %NSPR_NAME% >= %NSPR_VERSION%
 -Libs: -L${sdkdir}/lib -lmozjs
+-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
 +Libs: -L${sdkdir} -lmozjs
- Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
 diff -up mozilla/xulrunner/installer/Makefile.in.old mozilla/xulrunner/installer/Makefile.in
 --- mozilla/xulrunner/installer/Makefile.in.old	2007-08-10 14:56:59.000000000 +0200
-+++ mozilla/xulrunner/installer/Makefile.in	2007-11-15 16:33:15.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2007-11-26 14:18:09.000000000 +0100
 @@ -87,6 +87,14 @@ pkg_config_files = \
  	libxul-embedding.pc \
  	mozilla-js.pc \


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- xulrunner.spec	20 Nov 2007 12:46:45 -0000	1.29
+++ xulrunner.spec	26 Nov 2007 15:27:12 -0000	1.30
@@ -11,7 +11,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta1.1%{?dist}
+Release:        0.beta1.2%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -384,6 +384,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Nov 26 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta1.2
+- added xulrunner/js include dir to xulrunner-js
+
 * Tue Nov 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta1.1
 - update to beta 1