rpms/xulrunner/devel mozilla-gtkmozembed.patch, NONE, 1.1 mozilla-xulrunner-pkgconfig.patch, NONE, 1.1 xulrunner.spec, 1.25, 1.26 mozilla-xpcom.patch, 1.3, NONE

Martin Stransky (stransky) fedora-extras-commits at redhat.com
Thu Nov 15 17:21:38 UTC 2007 

Author: stransky

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

Modified Files:
	xulrunner.spec 
Added Files:
	mozilla-gtkmozembed.patch mozilla-xulrunner-pkgconfig.patch 
Removed Files:
	mozilla-xpcom.patch 
Log Message:
* Thu Nov 15 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.5
- registered xulrunner libs system-wide
- added xulrunner-gtkmozembed.pc



mozilla-gtkmozembed.patch:

--- NEW FILE mozilla-gtkmozembed.patch ---
diff -up mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.old mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in
--- mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in.old	2007-11-15 15:45:47.000000000 +0100
+++ mozilla/xulrunner/installer/mozilla-gtkmozembed.pc.in	2007-11-15 16:09:59.000000000 +0100
@@ -0,0 +1,13 @@
+prefix=%prefix%
+sdkdir=%sdkdir%
+includedir=%includedir%
+idldir=%idldir%
+includetype=stable
+libdir=%sdkdir%
+
+Name: mozilla-gtkembedmoz
+Description: Mozilla Embedding Widget for Gtk+
+Version: %MOZILLA_VERSION%
+Requires: %MOZ_APP_NAME%-xpcom = %MOZILLA_VERSION%
+Libs: -L${libdir} -lxpcomglue_s -lxul -lxpcom
+Cflags: -I${includedir}/gtkembedmoz

mozilla-xulrunner-pkgconfig.patch:

--- NEW FILE mozilla-xulrunner-pkgconfig.patch ---
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
@@ -65,7 +65,7 @@ mandir		= @mandir@
 idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(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)-$(MOZ_APP_VERSION)
 
 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
@@ -3,14 +3,15 @@ sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
 includetype=stable
+libdir=%sdkdir%
 
 # 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 -lxpcomglue_s -lxul -lxpcom
+Libs: -L${sdkdir} -lxpcomglue_s -lxul -lxpcom
 Cflags: -I${includedir}/${includetype} -fshort-wchar
\ 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
@@ -2,6 +2,7 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
+libdir=%sdkdir%
 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} -lxpcomglue_s -lxul -lxpcom
 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
@@ -2,15 +2,16 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
+libdir=%sdkdir%
 includetype=stable
 
 # 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: mozilla-xpcom
 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} -lxpcomglue_s -lxul -lxpcom
 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
@@ -2,14 +2,15 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
+libdir=%sdkdir%
 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: xulrunner-embedding
 Description: Static library for version-independent embedding of the Mozilla runtime
 Version: %MOZILLA_VERSION%
-Libs: -L${sdkdir}/lib -lxpcomglue
+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
@@ -1,6 +1,7 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
+libdir=%sdkdir%
 
 Name: Mozilla Plug-In API
 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
@@ -2,6 +2,7 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
+libdir=%sdkdir%
 includetype=stable
 
 # Note: the default pkg-config cflags will only list include directories
@@ -11,5 +12,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} -lxpcomglue
 Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
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
@@ -2,14 +2,15 @@ prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
 idldir=%idldir%
+libdir=%sdkdir%
 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
+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
@@ -5,7 +5,7 @@ idldir=%idldir%
 includetype=stable
 libdir=%sdkdir%
 
-Name: mozilla-gtkembedmoz
+Name: xulrunner-gtkembedmoz
 Description: Mozilla Embedding Widget for Gtk+
 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
@@ -1,10 +1,11 @@
 prefix=%prefix%
 sdkdir=%sdkdir%
 includedir=%includedir%
+libdir=%sdkdir%
 
 Name: JavaScript
 Description: The Mozilla JavaScript Library
 Version: %MOZILLA_VERSION%
 Requires: %NSPR_NAME% >= %NSPR_VERSION%
-Libs: -L${sdkdir}/lib -lmozjs
+Libs: -L${sdkdir} -lmozjs
 Cflags: -I${includedir}/stable -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
@@ -87,6 +87,14 @@ pkg_config_files = \
 	libxul-embedding.pc \
 	mozilla-js.pc \
 	mozilla-plugin.pc \
+	mozilla-xpcom.pc \
+	mozilla-embedding.pc \
+	mozilla-gtkmozembed.pc \
+	xulrunner-js.pc \
+	xulrunner-plugin.pc \
+	xulrunner-xpcom.pc \
+	xulrunner-embedding.pc \
+	xulrunner-gtkmozembed.pc \
 	$(NULL)
 
 ifdef MOZ_NATIVE_NSPR


Index: xulrunner.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xulrunner/devel/xulrunner.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- xulrunner.spec	14 Nov 2007 12:18:37 -0000	1.25
+++ xulrunner.spec	15 Nov 2007 17:21:05 -0000	1.26
@@ -11,7 +11,7 @@
 Summary:        XUL Runtime for Gecko Applications
 Name:           xulrunner
 Version:        1.9
-Release:        0.alpha9.4%{?dist}
+Release:        0.alpha9.5%{?dist}
 URL:            http://www.mozilla.org/projects/xulrunner/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -46,8 +46,9 @@
 
 # Other
 Patch104:       mozilla-firefox-head.ppc64.patch
-Patch105:       mozilla-xpcom.patch
-Patch106:       mozilla-sqlite-build.patch
+Patch105:       mozilla-sqlite-build.patch
+Patch106:       mozilla-gtkmozembed.patch
+Patch107:       mozilla-xulrunner-pkgconfig.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -127,6 +128,8 @@
 %patch4   -p1
 
 %patch104 -p0 -b .ppc64
+%patch105 -p1 -b .sqlite
+%patch106 -p1
 
 # Install missing *.pc files
 pushd xulrunner/installer
@@ -140,10 +143,10 @@
 cp mozilla-plugin.pc.in xulrunner-plugin.pc.in
 cp mozilla-xpcom.pc.in xulrunner-xpcom.pc.in
 cp mozilla-embedding.pc.in xulrunner-embedding.pc.in
+cp mozilla-gtkmozembed.pc.in xulrunner-gtkmozembed.pc.in
 popd
 
-%patch105 -p1 -b .pkg
-%patch106 -p1 -b .sqlite
+%patch107 -p1 -b .old
 
 
 # For branding specific patches.
@@ -268,6 +271,12 @@
 #GRE_PATH=${MOZ_APP_DIR}
 #EOF
 
+# Library path
+%{__mkdir_p} $RPM_BUILD_ROOT/etc/ld.so.conf.d
+%{__cat} > $RPM_BUILD_ROOT/etc/ld.so.conf.d/xulrunner.conf << EOF
+${MOZ_APP_DIR}
+EOF
+
 GECKO_VERSION=$(./config/milestone.pl --topsrcdir='.')
 %{__cat} %{SOURCE101} | %{__sed} -e "s/@GECKO_VERSION@/$GECKO_VERSION/g" > \
                         %{_builddir}/add-gecko-provides
@@ -304,9 +313,11 @@
 #---------------------------------------------------------------------
 
 %post
+/sbin/ldconfig
 #update-desktop-database %{_datadir}/applications
 
 %postun
+/sbin/ldconfig
 #update-desktop-database %{_datadir}/applications
 
 %preun
@@ -348,6 +359,7 @@
 %{_libdir}/%{name}-*/xulrunner-stub
 %{_libdir}/%{name}-*/platform.ini
 %{_libdir}/%{name}-*/dependentlibs.list
+%{_sysconfdir}/ld.so.conf.d/xulrunner.conf
 
 # XXX See if these are needed still
 %{_libdir}/%{name}-*/updater*
@@ -371,6 +383,10 @@
 #---------------------------------------------------------------------
 
 %changelog
+* Thu Nov 15 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.5
+- registered xulrunner libs system-wide
+- added xulrunner-gtkmozembed.pc
+
 * Wed Nov 14 2007 Martin Stransky <stransky at redhat.com> 1.9-0.alpha9.4
 - added proper nss/nspr dependencies
 


--- mozilla-xpcom.patch DELETED ---

More information about the fedora-extras-commits mailing list