rpms/xulrunner/devel mozilla-191-pkgconfig.patch, NONE, 1.1 .cvsignore, 1.64, 1.65 sources, 1.67, 1.68 xulrunner.spec, 1.143, 1.144 mozilla-pkgconfig.patch, 1.11, NONE

[Christopher Aillon]

Author: caillon

Update of /cvs/extras/rpms/xulrunner/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11769

Modified Files:
	.cvsignore sources xulrunner.spec 
Added Files:
	mozilla-191-pkgconfig.patch 
Removed Files:
	mozilla-pkgconfig.patch 
Log Message:
* Sat Dec 20 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.4
- 1.9.1 beta 2


mozilla-191-pkgconfig.patch:

--- NEW FILE mozilla-191-pkgconfig.patch ---
diff -r f1af606531f5 config/autoconf.mk.in
--- a/config/autoconf.mk.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/config/autoconf.mk.in	Mon Dec 01 22:30:12 2008 -0500
@@ -57,14 +57,14 @@
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
 bindir		= @bindir@
-includedir	= @includedir@/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+includedir	= @includedir@/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 libdir		= @libdir@
 datadir		= @datadir@
 mandir		= @mandir@
-idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 
 installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
+sdkdir		= $(libdir)/$(MOZ_APP_NAME)-sdk-$(MOZ_APP_VERSION)
 
 DIST		= $(DEPTH)/dist
 LIBXUL_SDK      = @LIBXUL_SDK@
diff -r f1af606531f5 xulrunner/installer/Makefile.in
--- a/xulrunner/installer/Makefile.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/Makefile.in	Mon Dec 01 22:30:12 2008 -0500
@@ -116,6 +118,7 @@
 	-e "s|%includedir%|$(includedir)|" \
 	-e "s|%idldir%|$(idldir)|" \
 	-e "s|%sdkdir%|$(sdkdir)|" \
+	-e "s|%libdir%|$(installdir)|" \
 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
diff -r f1af606531f5 xulrunner/installer/libxul-embedding-unstable.pc.in
--- a/xulrunner/installer/libxul-embedding-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/libxul-embedding-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,11 +1,12 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/unstable
 includetype=unstable
 
 Name: libxul-embedding-unstable
 Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
 Version: %MOZILLA_VERSION%
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
 Libs: -L${sdkdir}/lib -lxpcomglue
 Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff -r f1af606531f5 xulrunner/installer/libxul-embedding.pc.in
--- a/xulrunner/installer/libxul-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/libxul-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,7 +1,7 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/stable
 includetype=stable
 
 # Note: the default pkg-config cflags will only list include directories
@@ -11,5 +11,6 @@
 Name: libxul-embedding
 Description: Static library for version-independent embedding of the Mozilla runtime
 Version: %MOZILLA_VERSION%
-Libs: -L${sdkdir}/lib -lxpcomglue
+Requires: %NSPR_NAME% >= %NSPR_VERSION%
+Libs: -L${sdkdir}/sdk/lib -lxpcomglue
 Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff -r f1af606531f5 xulrunner/installer/libxul-unstable.pc.in
--- a/xulrunner/installer/libxul-unstable.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/libxul-unstable.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,7 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
+libdir=%libdir%
 includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/unstable
 includetype=unstable
 
 Name: libxul
diff -r f1af606531f5 xulrunner/installer/libxul.pc.in
--- a/xulrunner/installer/libxul.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/libxul.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,7 +1,8 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
+libdir=%libdir%
 includedir=%includedir%
-idldir=%idldir%
+idldir=%idldir%/stable
 includetype=stable
 
 # Note: the default pkg-config includes will only list include directories
@@ -12,5 +13,5 @@
 Description: The Mozilla Runtime and Embedding Engine
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lxpcomglue_s -lxul -lxpcom
+Libs: -L${sdkdir}/sdk/lib -lxpcomglue_s -lxul -lxpcom
 Cflags: -I${includedir}/${includetype} %WCHAR_CFLAGS%
diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in
--- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,5 +1,6 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
+libdir=%libdir%
 includedir=%includedir%
 
 Name: mozilla-gtkembedmoz
diff -r f1af606531f5 xulrunner/installer/mozilla-gtkmozembed.pc.in
--- a/xulrunner/installer/mozilla-gtkmozembed.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -1,5 +1,6 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
+libdir=%libdir%
 includedir=%includedir%
 
 Name: mozilla-gtkembedmoz
diff -r f1af606531f5 xulrunner/installer/mozilla-js.pc.in
--- a/xulrunner/installer/mozilla-js.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/mozilla-js.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -6,5 +6,5 @@
 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}/sdk/lib -lmozjs
+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff -r f1af606531f5 xulrunner/installer/mozilla-plugin.pc.in
--- a/xulrunner/installer/mozilla-plugin.pc.in	Sat Nov 22 20:22:22 2008 +0100
+++ b/xulrunner/installer/mozilla-plugin.pc.in	Mon Dec 01 22:30:12 2008 -0500
@@ -6,4 +6,4 @@
 Description: Mozilla Plug-In API
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Cflags: -I${includedir}/stable
+Cflags: -I${includedir}/stable -I${inncludedir}/java -I${includedir}/plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/.cvsignore,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -r1.64 -r1.65
--- .cvsignore	5 Dec 2008 04:45:34 -0000	1.64
+++ .cvsignore	21 Dec 2008 22:29:12 -0000	1.65
@@ -1 +1 @@
-xulrunner-1.9.1b1-source.tar.bz2
+xulrunner-1.9.1b2-source.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/sources,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- sources	5 Dec 2008 04:45:34 -0000	1.67
+++ sources	21 Dec 2008 22:29:13 -0000	1.68
@@ -1 +1 @@
-d101c02c8ad670eeb2095e449c79c085  xulrunner-1.9.1b1-source.tar.bz2
+961168576de81960630013f22f3e61c0  xulrunner-1.9.1b2-source.tar.bz2


Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- xulrunner.spec	18 Dec 2008 02:39:00 -0000	1.143
+++ xulrunner.spec	21 Dec 2008 22:29:13 -0000	1.144
@@ -11,11 +11,11 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9.1
-Release:        0.3.beta1%{?dist}
+Release:        0.4.beta2%{?dist}
 URL:            http://developer.mozilla.org/En/XULRunner
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
-Source0:        xulrunner-%{version}b1-source.tar.bz2
+Source0:        xulrunner-%{version}b2-source.tar.bz2
 Source10:       %{name}-mozconfig
 Source12:       %{name}-redhat-default-prefs.js
 Source21:       %{name}.sh.in
@@ -29,7 +29,7 @@
 Patch4:         mozilla-jemalloc.patch
 
 # Fedora specific patches
-Patch10:        mozilla-pkgconfig.patch
+Patch10:        mozilla-191-pkgconfig.patch
 
 # Upstream patches
 Patch26:        mozilla-ps-pdf-simplify-operators.patch
@@ -382,6 +382,7 @@
 %{mozappdir}/greprefs
 %dir %{mozappdir}/icons
 %attr(644, root, root) %{mozappdir}/icons/*
+%{mozappdir}/js
 %{mozappdir}/modules
 %{mozappdir}/plugins
 %{mozappdir}/res
@@ -442,6 +443,9 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Sat Dec 20 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.4
+- 1.9.1 beta 2
+
 * Tue Dec  9 2008 Christopher Aillon <caillon at redhat.com> 1.9.1-0.3
 - Mark this as a pre-release
 


--- mozilla-pkgconfig.patch DELETED ---