rpms/openoffice.org/FC-4 openoffice.org-1.9.114.ooo51718.rpath.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.114.ooo51718.rpath.patch 
Log Message:
tag on a build fix for xmerge

openoffice.org-1.9.114.ooo51718.rpath.patch:
 berkeleydb/makefile.mk         |    7 +++++++
 source/xmerge/build.xml        |    0 
 xmerge/source/xmerge/build.xml |    6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

Index: openoffice.org-1.9.114.ooo51718.rpath.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/FC-4/openoffice.org-1.9.114.ooo51718.rpath.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.114.ooo51718.rpath.patch	28 Sep 2005 13:24:05 -0000	1.2
+++ openoffice.org-1.9.114.ooo51718.rpath.patch	22 Dec 2005 08:18:42 -0000	1.3
@@ -19,3 +19,23 @@
  CONFIGURE_DIR=out
  #relative to CONFIGURE_DIR
  CONFIGURE_ACTION=..$/dist$/configure
+Index: source/xmerge/build.xml
+===================================================================
+RCS file: /cvs/xml/xmerge/source/xmerge/build.xml,v
+retrieving revision 1.2
+diff -u -r1.2 build.xml
+--- openoffice.org.orig/xmerge/source/xmerge/build.xml	24 Oct 2005 17:57:33 -0000	1.2
++++ openoffice.org/xmerge/source/xmerge/build.xml	22 Dec 2005 08:41:41 -0000
+@@ -58,9 +58,9 @@
+     <property file="../inc/antbuild.properties"/>
+         
+     <path id="classpath">
+-        <pathelement location="${solar.jar}/parser.jar"/>
+-        <pathelement location="${solar.jar}/jaxp.jar"/>
+-        <pathelement location="${solar.jar}/xerces.jar"/>    
++        <pathelement location="${solar.jar}/xml-apis.jar"/>
++        <pathelement location="${solar.jar}/xerces.jar"/>
++        <pathelement location="${solar.jar}/xalan.jar"/>    
+         <pathelement location="${solar.jar}/unoil.jar"/>
+         <pathelement location="${solar.jar}/ridl.jar"/>
+         <pathelement location="${solar.jar}/jurt.jar"/>