rpms/openoffice.org/devel workspace.systemlibxmlfix.patch, NONE, 1.1 openoffice.org.spec, 1.532, 1.533 workspace.cmcfixes21.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2300

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.systemlibxmlfix.patch 
Removed Files:
	workspace.cmcfixes21.patch 
Log Message:
rename patch to match the workspace it went into

workspace.systemlibxmlfix.patch:
 source/ucp/webdav/makefile.mk     |    0 
 ucb/source/ucp/webdav/makefile.mk |    7 ++++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE workspace.systemlibxmlfix.patch ---
Index: source/ucp/webdav/makefile.mk
===================================================================
RCS file: /cvs/ucb/ucb/source/ucp/webdav/makefile.mk,v
retrieving revision 1.25
diff -u -p -u -r1.25 makefile.mk
--- openoffice.org.orig/ucb/source/ucp/webdav/makefile.mk	18 Oct 2005 08:47:29 -0000	1.25
+++ openoffice.org/ucb/source/ucp/webdav/makefile.mk	6 Nov 2005 15:41:42 -0000
@@ -61,8 +61,13 @@ NO_BSYMBOLIC=TRUE
 CFLAGS+= $(NEON_CFLAGS)
 .ELSE
 NEONINCDIR=external$/neon
+CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR)
+.ENDIF
+.IF "$(SYSTEM_LIBXML)" == "YES"
+CFLAGS+= $(LIBXML_CFLAGS)
+.ELSE
 LIBXMLINCDIR=external$/libxml
-CFLAGS+= -I$(SOLARINCDIR)$/$(NEONINCDIR) -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
+CFLAGS+= -I$(SOLARINCDIR)$/$(LIBXMLINCDIR)
 .ENDIF
 
 # --- General -----------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.532
retrieving revision 1.533
diff -u -r1.532 -r1.533
--- openoffice.org.spec	9 Nov 2005 09:07:48 -0000	1.532
+++ openoffice.org.spec	9 Nov 2005 10:45:31 -0000	1.533
@@ -202,7 +202,7 @@
 Patch48: workspace.atkbridge.patch
 Patch49: workspace.cmcfixes20.patch
 Patch50: openoffice.org-2.0.0.ooo56536.sw.rtfcrash.patch
-Patch51: workspace.cmcfixes21.patch
+Patch51: workspace.systemlibxmlfix.patch
 Patch52: workspace.jaxpapi.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
@@ -869,7 +869,7 @@
 %patch48 -p1 -b .workspace.atkbridge.patch
 %patch49 -p1 -b .workspace.cmcfixes20.patch
 %patch50 -p1 -b .ooo56536.sw.rtfcrash.patch
-%patch51 -p1 -b .workspace.cmcfixes21.patch
+%patch51 -p1 -b .workspace.systemlibxmlfix.patch
 # %patch52 -p1 -b .workspace.jaxpapi.patch
 
 %if %{includingexternals}
@@ -3259,7 +3259,7 @@
 - drop integrated workspace.emblock1.patch
 - drop integrated workspace.cmcfixes18.patch
 - drop integrated workspace.cmcfixes19.patch
-- add workspace.cmcfixes21.patch
+- add workspace.systemlibxmlfix.patch
 - additional hungarian help
 
 * Fri Oct 28 2005 Caolan McNamara <caolanm at redhat.com> - 1:2.0.0-3.8


--- workspace.cmcfixes21.patch DELETED ---