rpms/openoffice.org/devel openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch, NONE, 1.1 openoffice.org.spec, 1.1438, 1.1439 openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch, 1.4, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch 
Removed Files:
	openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch 
Log Message:
upstream libxul fixes

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

--- NEW FILE openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch ---
--- openoffice.org.orig/config_office/configure.in	2008-01-08 15:33:40.000000000 +0000
+++ openoffice.org/config_office/configure.in	2008-01-08 15:34:32.000000000 +0000
@@ -3736,7 +3736,7 @@
     tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst(<STDIN>);'`
     AC_MSG_RESULT($tmp)
 
-    PKG_CHECK_MODULES( MOZILLAXPCOM, $MOZ_FLAVOUR-xpcom )
+    PKG_CHECK_MODULES( MOZILLAXPCOM, libxul )
 
     if $PKG_CONFIG --exists nspr ; then
       PKG_CHECK_MODULES( MOZ_NSPR, nspr )
@@ -3767,8 +3767,8 @@
     CPPFLAGS="$save_CPPFLAGS"
     LIBS="$save_LIBS"
 
-    MOZ_INC=`$PKG_CONFIG --variable=includedir $MOZ_FLAVOUR-xpcom`
-    MOZ_LIB=`$PKG_CONFIG --variable=libdir $MOZ_FLAVOUR-xpcom`
+    MOZ_INC=`$PKG_CONFIG --variable=includedir libxul`
+    MOZ_LIB=`$PKG_CONFIG --variable=sdkdir libxul`/lib
     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


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1438
retrieving revision 1.1439
diff -u -r1.1438 -r1.1439
--- openoffice.org.spec	28 Feb 2008 08:43:14 -0000	1.1438
+++ openoffice.org.spec	4 Mar 2008 08:53:36 -0000	1.1439
@@ -129,7 +129,7 @@
 Patch55: openoffice.org-2.3.1.ooo84621.sw.insertexcel.patch
 Patch56: openoffice.org-2.3.1.ooo84770.svx.eventsmismatch.patch
 Patch57: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
-Patch58: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
+Patch58: openoffice.org-2.4.0.ooo86670.config_office.xpcomasxul.patch
 Patch59: openoffice.org-2.4.0.ooo85097.desktop.pagein.patch
 Patch60: openoffice.org-2.4.0.oooXXXXX.solenv.paths.patch
 Patch61: openoffice.org-2.4.0.rh133741.alwaysgtk.vcl.patch
@@ -1087,7 +1087,7 @@
 %patch55 -p1 -b .ooo84621.sw.insertexcel.patch
 %patch56 -p1 -b .ooo84770.svx.eventsmismatch.patch
 %patch57 -p1 -b .ooo85054.stlport.noorigs.patch
-%patch58 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
+%patch58 -p1 -b .ooo86670.config_office.xpcomasxul.patch
 %patch59 -p1 -b .ooo85097.desktop.pagein.patch
 %patch60 -p1
 %patch61 -p1 -b .rh133741.alwaysgtk.vcl.patch


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