rpms/xulrunner/devel mozilla-pkgconfig.patch, 1.2, 1.3 xulrunner.spec, 1.36, 1.37
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Fri Dec 21 10:11:46 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11913
Modified Files:
mozilla-pkgconfig.patch xulrunner.spec
Log Message:
added java and plugin subdirs to plugin includes
mozilla-pkgconfig.patch:
Index: mozilla-pkgconfig.patch
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/mozilla-pkgconfig.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mozilla-pkgconfig.patch 18 Dec 2007 13:12:49 -0000 1.2
+++ mozilla-pkgconfig.patch 21 Dec 2007 10:11:37 -0000 1.3
@@ -1,38 +1,25 @@
-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 2007-12-18 12:35:35.000000000 +0100
-@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
- 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 -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 2007-12-18 12:35:35.000000000 +0100
-@@ -2,6 +2,7 @@ prefix=%prefix%
+diff -up mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-embedding.pc.in
+--- mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-embedding.pc.in 2007-12-21 10:54:12.000000000 +0100
+@@ -2,13 +2,14 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
idldir=%idldir%
+libdir=%installdir%
includetype=stable
- # Note: the default pkg-config includes will only list include directories
+ # Note: the default pkg-config cflags will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+
+-Name: libxul-embedding
++Name: mozilla-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
diff -up mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.pk mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in
---- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in 2007-12-18 12:35:35.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in 2007-12-21 10:54:12.000000000 +0100
@@ -5,7 +5,7 @@ idldir=%idldir%
includetype=stable
libdir=%sdkdir%
@@ -42,9 +29,20 @@
Description: Mozilla Embedding Widget for Gtk+
Version: %MOZILLA_VERSION%
Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
+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 2007-12-21 10:54:12.000000000 +0100
+@@ -2,6 +2,7 @@ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ idldir=%idldir%
++libdir=%installdir%
+ includetype=stable
+
+ # Note: the default pkg-config includes will only list include directories
diff -up mozilla/xulrunner/installer/Makefile.in.pk mozilla/xulrunner/installer/Makefile.in
---- mozilla/xulrunner/installer/Makefile.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/Makefile.in 2007-12-18 12:48:50.000000000 +0100
+--- mozilla/xulrunner/installer/Makefile.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/Makefile.in 2007-12-21 10:54:12.000000000 +0100
@@ -89,6 +89,14 @@ pkg_config_files = \
libxul-embedding.pc \
mozilla-js.pc \
@@ -68,27 +66,24 @@
-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
-diff -up mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.pk mozilla/xulrunner/installer/xulrunner-xpcom.pc.in
---- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-12-18 12:35:35.000000000 +0100
-@@ -3,12 +3,13 @@ sdkdir=%sdkdir%
+diff -up mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk mozilla/xulrunner/installer/xulrunner-plugin.pc.in
+--- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-12-21 11:07:43.000000000 +0100
+@@ -1,9 +1,10 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
includedir=%includedir%
- idldir=%idldir%
- includetype=stable
+libdir=%installdir%
- # Note: the default pkg-config includes will only list include directories
- # that contain stable (frozen or safe for linking) header files. To include
- # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
-
--Name: libxul
-+Name: xulrunner-xpcom
- Description: The Mozilla Runtime and Embedding Engine
+ Name: Mozilla Plug-In API
+ Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Cflags: -I${includedir}/stable
++Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
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 2007-08-03 16:46:28.000000000 +0200
-+++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in 2007-12-21 10:54:12.000000000 +0100
@@ -2,6 +2,7 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
@@ -97,25 +92,27 @@
includetype=stable
# Note: the default pkg-config cflags will only list include directories
-diff -up mozilla/xulrunner/installer/xulrunner-js.pc.in.pk mozilla/xulrunner/installer/xulrunner-js.pc.in
---- mozilla/xulrunner/installer/xulrunner-js.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-12-18 12:35:35.000000000 +0100
-@@ -1,10 +1,11 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
+diff -up mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.pk mozilla/xulrunner/installer/xulrunner-xpcom.pc.in
+--- mozilla/xulrunner/installer/xulrunner-xpcom.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-12-21 10:54:12.000000000 +0100
+@@ -3,12 +3,13 @@ sdkdir=%sdkdir%
includedir=%includedir%
+ idldir=%idldir%
+ includetype=stable
+libdir=%installdir%
- Name: JavaScript
- Description: The Mozilla JavaScript Library
+ # Note: the default pkg-config includes will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+
+-Name: libxul
++Name: xulrunner-xpcom
+ Description: The Mozilla Runtime and Embedding Engine
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -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/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 2007-12-18 12:35:35.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-js.pc.in 2007-12-21 10:54:12.000000000 +0100
@@ -7,4 +7,4 @@ Description: The Mozilla JavaScript Libr
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
@@ -123,8 +120,8 @@
-Cflags: -I${includedir}/stable -DXP_UNIX -DJS_THREADSAFE
+Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff -up mozilla/xulrunner/installer/xulrunner-embedding.pc.in.pk mozilla/xulrunner/installer/xulrunner-embedding.pc.in
---- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-12-18 12:35:35.000000000 +0100
+--- mozilla/xulrunner/installer/xulrunner-embedding.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-12-21 10:54:12.000000000 +0100
@@ -2,13 +2,14 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
@@ -141,20 +138,25 @@
Description: Static library for version-independent embedding of the Mozilla runtime
Version: %MOZILLA_VERSION%
Libs: -L${sdkdir}/lib -lxpcomglue
-diff -up mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk mozilla/xulrunner/installer/xulrunner-plugin.pc.in
---- mozilla/xulrunner/installer/xulrunner-plugin.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-12-18 12:35:35.000000000 +0100
-@@ -1,6 +1,7 @@
+diff -up mozilla/xulrunner/installer/xulrunner-js.pc.in.pk mozilla/xulrunner/installer/xulrunner-js.pc.in
+--- mozilla/xulrunner/installer/xulrunner-js.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-12-21 10:54:12.000000000 +0100
+@@ -1,10 +1,11 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
+libdir=%installdir%
- Name: Mozilla Plug-In API
- Description: Mozilla Plug-In API
+ 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
++Cflags: -I${includedir}/stable -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff -up mozilla/xulrunner/installer/mozilla-xpcom.pc.in.pk mozilla/xulrunner/installer/mozilla-xpcom.pc.in
---- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-12-18 12:35:35.000000000 +0100
+--- mozilla/xulrunner/installer/mozilla-xpcom.pc.in.pk 2007-12-21 10:54:12.000000000 +0100
++++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-12-21 10:54:12.000000000 +0100
@@ -2,13 +2,14 @@ prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
@@ -171,29 +173,10 @@
Description: The Mozilla Runtime and Embedding Engine
Version: %MOZILLA_VERSION%
Requires: %NSPR_NAME% >= %NSPR_VERSION%
-diff -up mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk mozilla/xulrunner/installer/mozilla-embedding.pc.in
---- mozilla/xulrunner/installer/mozilla-embedding.pc.in.pk 2007-12-18 12:35:35.000000000 +0100
-+++ mozilla/xulrunner/installer/mozilla-embedding.pc.in 2007-12-18 12:35:35.000000000 +0100
-@@ -2,13 +2,14 @@ prefix=%prefix%
- sdkdir=%sdkdir%
- includedir=%includedir%
- idldir=%idldir%
-+libdir=%installdir%
- includetype=stable
-
- # Note: the default pkg-config cflags will only list include directories
- # that contain stable (frozen or safe for linking) header files. To include
- # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
-
--Name: libxul-embedding
-+Name: mozilla-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue
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 2007-12-18 12:35:35.000000000 +0100
-@@ -1,6 +1,7 @@
++++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2007-12-21 11:07:20.000000000 +0100
+@@ -1,9 +1,10 @@
prefix=%prefix%
sdkdir=%sdkdir%
includedir=%includedir%
@@ -201,3 +184,28 @@
Name: Mozilla Plug-In API
Description: Mozilla Plug-In API
+ Version: %MOZILLA_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Cflags: -I${includedir}/stable
++Cflags: -I${includedir}/stable -I${includedir}/java -I${includedir}/plugin
+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 2007-12-21 10:54:12.000000000 +0100
+@@ -58,14 +58,14 @@ MOZ_PKG_SPECIAL = @MOZ_PKG_SPECIAL@
+ 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@
Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- xulrunner.spec 20 Dec 2007 16:54:01 -0000 1.36
+++ xulrunner.spec 21 Dec 2007 10:11:37 -0000 1.37
@@ -11,7 +11,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.beta2.2%{?dist}
+Release: 0.beta2.3%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -414,6 +414,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Dec 21 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta2.3
+- added java and plugin subdirs to plugin includes
+
* Thu Dec 20 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta2.2
- dependency fixes, obsoletes firefox < 3 and firefox-devel now
More information about the fedora-extras-commits
mailing list