rpms/openoffice.org/devel openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch, 1.3, 1.4

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12300

Modified Files:
	openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch 
Log Message:
more xulrunner pkgconfig changes

openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch:

Index: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch	9 Jan 2008 12:45:17 -0000	1.3
+++ openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch	9 Jan 2008 16:16:24 -0000	1.4
@@ -20,3 +20,18 @@
      MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS
      if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then
        AC_MSG_CHECKING([whether $tmp was compiled with --enable-ldap])
+Index: source/plugin/util/makefile.pmk
+===================================================================
+RCS file: /cvs/util/extensions/source/plugin/util/makefile.pmk,v
+retrieving revision 1.6
+diff -u -r1.6 makefile.pmk
+--- openoffice.org.orig/extensions/source/plugin/util/makefile.pmk	6 Feb 2007 12:59:38 -0000	1.6
++++ openoffice.org/extensions/source/plugin/util/makefile.pmk	9 Jan 2008 16:15:21 -0000
+@@ -39,6 +39,6 @@
+ 
+ .IF "$(SYSTEM_MOZILLA)" == "YES"
+ CFLAGS+=-DSYSTEM_MOZILLA
+-PKGCONFIG_MODULES=$(MOZ_FLAVOUR)-plugin
++PKGCONFIG_MODULES=mozilla-plugin
+ .INCLUDE : pkg_config.mk
+ .ENDIF