rpms/xulrunner/devel mozilla-pkgconfig.patch, NONE, 1.1 xulrunner.spec, 1.31, 1.32 mozilla-xulrunner-pkgconfig.patch, 1.2, NONE
Martin Stransky (stransky)
fedora-extras-commits at redhat.com
Thu Dec 6 09:58:20 UTC 2007
Author: stransky
Update of /cvs/pkgs/rpms/xulrunner/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27529
Modified Files:
xulrunner.spec
Added Files:
mozilla-pkgconfig.patch
Removed Files:
mozilla-xulrunner-pkgconfig.patch
Log Message:
fixed mozilla-plugin.pc (#412971)
mozilla-pkgconfig.patch:
--- NEW FILE mozilla-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-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/xulrunner-xpcom.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/mozilla-xpcom.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/xulrunner-embedding.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/xulrunner-plugin.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.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-js.pc.in.old mozilla/xulrunner/installer/mozilla-js.pc.in
--- mozilla/xulrunner/installer/mozilla-js.pc.in.old 2007-08-03 16:46:28.000000000 +0200
+++ mozilla/xulrunner/installer/mozilla-js.pc.in 2007-12-06 10:48:22.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-plugin.pc.in.old mozilla/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla/xulrunner/installer/mozilla-plugin.pc.in.old 2007-08-03 16:46:28.000000000 +0200
+++ mozilla/xulrunner/installer/mozilla-plugin.pc.in 2007-12-06 10:51:23.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/mozilla-embedding.pc.in.old mozilla/xulrunner/installer/mozilla-embedding.pc.in
--- mozilla/xulrunner/installer/mozilla-embedding.pc.in.old 2007-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/mozilla-embedding.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/xulrunner-gtkmozembed.pc.in 2007-12-06 10:48:22.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-12-06 10:48:22.000000000 +0100
+++ mozilla/xulrunner/installer/xulrunner-js.pc.in 2007-12-06 10:48:22.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
-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/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-12-06 10:48:22.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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- xulrunner.spec 27 Nov 2007 14:41:00 -0000 1.31
+++ xulrunner.spec 6 Dec 2007 09:57:48 -0000 1.32
@@ -11,7 +11,7 @@
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.beta1.3%{?dist}
+Release: 0.beta1.4%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@@ -48,7 +48,7 @@
Patch104: mozilla-firefox-head.ppc64.patch
Patch105: mozilla-sqlite-build.patch
Patch106: mozilla-gtkmozembed.patch
-Patch107: mozilla-xulrunner-pkgconfig.patch
+Patch107: mozilla-pkgconfig.patch
%if %{official_branding}
# Required by Mozilla Corporation
@@ -146,7 +146,7 @@
cp mozilla-gtkmozembed.pc.in xulrunner-gtkmozembed.pc.in
popd
-%patch107 -p1 -b .old
+%patch107 -p1 -b .pkg
# For branding specific patches.
@@ -384,6 +384,9 @@
#---------------------------------------------------------------------
%changelog
+* Thu Dec 06 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta1.4
+- fixed mozilla-plugin.pc (#412971)
+
* Tue Nov 27 2007 Martin Stransky <stransky at redhat.com> 1.9-0.beta1.3
- export /etc/gre.d/gre.conf (it's used by python gecko applications)
--- mozilla-xulrunner-pkgconfig.patch DELETED ---
More information about the fedora-extras-commits
mailing list