rpms/xulrunner/devel mozilla-pkgconfig.patch, 1.7, 1.8 xulrunner.spec, 1.54, 1.55

Martin Stransky (stransky) fedora-extras-commits at redhat.com
Wed Jan 23 15:17:11 UTC 2008 

Author: stransky

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

Modified Files:
	mozilla-pkgconfig.patch xulrunner.spec 
Log Message:
* Wed Jan 23 2008 Martin Stransky <stransky at redhat.com> 1.9-0.beta2.13
- fixed stable pkg-config files (#429654)
- removed sqlite patch



mozilla-pkgconfig.patch:

Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mozilla-pkgconfig.patch	23 Jan 2008 09:54:12 -0000	1.7
+++ mozilla-pkgconfig.patch	23 Jan 2008 15:16:57 -0000	1.8
@@ -1,6 +1,6 @@
 diff -up mozilla/config/autoconf.mk.in.pk mozilla/config/autoconf.mk.in
---- mozilla/config/autoconf.mk.in.pk	2007-10-11 20:50:54.000000000 +0200
-+++ mozilla/config/autoconf.mk.in	2008-01-16 16:29:22.000000000 +0100
+--- mozilla/config/autoconf.mk.in.pk	2008-01-22 03:50:04.000000000 +0100
++++ mozilla/config/autoconf.mk.in	2008-01-23 15:34:19.000000000 +0100
 @@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
  prefix		= @prefix@
  exec_prefix	= @exec_prefix@
@@ -21,7 +21,7 @@
  LIBXUL_SDK      = @LIBXUL_SDK@
 diff -up mozilla/xulrunner/installer/libxul.pc.in.pk mozilla/xulrunner/installer/libxul.pc.in
 --- mozilla/xulrunner/installer/libxul.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-16 16:40:56.000000000 +0100
++++ mozilla/xulrunner/installer/libxul.pc.in	2008-01-23 15:45:30.000000000 +0100
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -32,9 +32,17 @@
  includetype=stable
  
  # Note: the default pkg-config includes will only list include directories
+@@ -12,5 +13,5 @@ Name: libxul
+ 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} -fshort-wchar
+\ No newline at end of file
 diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-16 16:29:22.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in	2008-01-16 16:42:57.000000000 +0100
+--- mozilla/xulrunner/installer/Makefile.in.pk	2008-01-23 15:34:19.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in	2008-01-23 15:34:19.000000000 +0100
 @@ -117,6 +117,7 @@ endif
  	-e "s|%includedir%|$(includedir)|" \
  	-e "s|%idldir%|$(idldir)|" \
@@ -45,7 +53,7 @@
  	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
 diff -up mozilla/xulrunner/installer/libxul-unstable.pc.in.pk mozilla/xulrunner/installer/libxul-unstable.pc.in
 --- mozilla/xulrunner/installer/libxul-unstable.pc.in.pk	2008-01-05 07:50:34.000000000 +0100
-+++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-16 16:41:23.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-unstable.pc.in	2008-01-23 15:34:19.000000000 +0100
 @@ -1,7 +1,8 @@
  prefix=%prefix%
  sdkdir=%sdkdir%
@@ -56,18 +64,30 @@
  includetype=unstable
  
  Name: libxul
+diff -up mozilla/xulrunner/installer/libxul-embedding.pc.in.pk mozilla/xulrunner/installer/libxul-embedding.pc.in
+--- mozilla/xulrunner/installer/libxul-embedding.pc.in.pk	2008-01-23 15:45:43.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in	2008-01-23 15:45:55.000000000 +0100
+@@ -11,5 +11,5 @@ includetype=stable
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+-Libs: -L${sdkdir}/lib -lxpcomglue
++Libs: -L${sdkdir}/sdk/lib -lxpcomglue
+ Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
 diff -up mozilla/xulrunner/installer/mozilla-js.pc.in.pk mozilla/xulrunner/installer/mozilla-js.pc.in
 --- mozilla/xulrunner/installer/mozilla-js.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-16 16:29:22.000000000 +0100
-@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
++++ mozilla/xulrunner/installer/mozilla-js.pc.in	2008-01-23 15:46:18.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
+-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 -up mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk mozilla/xulrunner/installer/mozilla-plugin.pc.in
 --- mozilla/xulrunner/installer/mozilla-plugin.pc.in.pk	2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-16 16:29:22.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in	2008-01-23 15:34:19.000000000 +0100
 @@ -6,4 +6,4 @@ Name: Mozilla Plug-In API
  Description: Mozilla Plug-In API
  Version: %MOZILLA_VERSION%


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- xulrunner.spec	23 Jan 2008 09:54:12 -0000	1.54
+++ xulrunner.spec	23 Jan 2008 15:16:57 -0000	1.55
@@ -9,7 +9,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.beta2.12.nightly20080121%{?dist}
+Release:        0.beta2.13.nightly20080121%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -387,6 +387,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Jan 23 2008 Martin Stransky <stransky at redhat.com> 1.9-0.beta2.13
+- fixed stable pkg-config files (#429654)
+- removed sqlite patch
+
 * Mon Jan 21 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.beta2.12
 - Update to latest trunk (2008-01-21)

More information about the fedora-extras-commits mailing list