rpms/openoffice.org/devel openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch, NONE, 1.1 openoffice.org.spec, 1.1367, 1.1368

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch 
Log Message:
add openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch to build

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

--- NEW FILE openoffice.org-2.4.0.oooXXXXX.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=libdir libxul`
     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: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1367
retrieving revision 1.1368
diff -u -r1.1367 -r1.1368
--- openoffice.org.spec	8 Jan 2008 14:51:51 -0000	1.1367
+++ openoffice.org.spec	8 Jan 2008 15:36:51 -0000	1.1368
@@ -134,6 +134,7 @@
 Patch60: openoffice.org-2.4.0.ooo84684.vcl.fixfontconfig.patch
 Patch61: openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
 Patch62: openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+Patch63: openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1082,6 +1083,7 @@
 %patch60 -p1 -b .ooo84684.vcl.fixfontconfig.patch
 %patch61 -p1 -b .ooo85054.stlport.noorigs.patch
 %patch62 -p1 -b .oo85055.psprint.linetoolong.patch
+%patch63 -p1 -b .oooXXXXX.config_office.xpcomasxul.patch
 
 # temporary until hsqldb is updated in rawhide
 sed -i -e "s/exit 1/exit 0/g" config_office/configure.in
@@ -2839,6 +2841,7 @@
 - add Requires for indic hunspell dictionaries
 - Resolves: rhbz#427757 add openoffice.org-2.4.0.ooo85054.stlport.noorigs.patch
 - Resolves: rhbz#426876 add openoffice.org-2.4.0.ooo85055.psprint.linetoolong.patch
+- add openoffice.org-2.4.0.oooXXXXX.config_office.xpcomasxul.patch to build
 
 * Wed Jan 03 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.3.1-9.11
 - Resolves: rhbz#427071 openoffice.org-2.3.0.ooo81314.i18npool.crash.patch