rpms/openoffice.org/devel openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch, 1.2, 1.3

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch 
Log Message:
attempt manual patch fix

openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch:
 hsqldb_1_8_0 |21458 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 21411 insertions(+), 47 deletions(-)

Index: openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch	17 Jul 2005 11:35:30 -0000	1.2
+++ openoffice.org-1.9.113.gcc19870.gcjaccessproblem.hsqldb.patch	20 Jul 2005 11:25:46 -0000	1.3
@@ -5,54 +5,7 @@
 diff -u -p -r1.6 hsqldb_1_8_0
 --- openoffice.org.orig/hsqldb/hsqldb_1_8_0	14 Jul 2005 11:42:23 -0000	1.6
 +++ openoffice.org/hsqldb/hsqldb_1_8_0	17 Jul 2005 11:33:01 -0000
-@@ -1,59 +1,21456 @@
--Files misc/hsqldb/lib/hsqldb.jar and misc/build/hsqldb/lib/hsqldb.jar differ
--*** misc/build/hsqldb/build/build.xml	2005-07-01 17:33:43.000000000 +0200
----- misc/build/hsqldb/build/build.xml_patched	2005-07-01 17:37:26.000000000 +0200
-+diff -cr misc/hsqldb/build/build.xml misc/build/hsqldb/build/build.xml
-+*** misc/hsqldb/build/build.xml	2005-07-17 12:23:09.000000000 +0100
-+--- misc/build/hsqldb/build/build.xml	2005-07-17 12:22:21.000000000 +0100
- ***************
- *** 3,8 ****
- --- 3,9 ----
--  <!-- additional targets by unsaved at users.sourceforge.net 2004 - 2005 -->
-+  <!-- additional targets by unsaved at users.sourceforge.net 2004 - 2005 -->
-+  
-+  <project name="hsqldb" default="help" basedir="../">
-++    <target name="init">
-+     <!-- This loads properties in the same exact way as if you ran
-+          "ant -Dprop1name=val1 -Dprop2name=val2...", etc.  To use all
-+          defaults, you should have no 'build.properties' file.
-+***************
-+*** 21,34 ****
-+                 locale="en"/>
-+     </tstamp>
-+  
-+!    <property name="build.label" value="private-${_tmpstamp}"/>
-+!    <property name="build.vendor" value="${user.name}"/>
-+     <property name="hsqldb.title" value="HSQLDB"/>
-+     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
-+     <property name="src" value="${basedir}/src"/>
-+     <property name="build.debug" value="off"/>
-+  
-+-    <target name="init">
-+     </target>
-+  
-+     <target name='explainjars'
-+--- 22,34 ----
-+                 locale="en"/>
-+     </tstamp>
-+  
-+!    <property name="build.label" value="build-${_tmpstamp}"/>
-+!    <property name="build.vendor" value="OpenOffice.org"/>
-+     <property name="hsqldb.title" value="HSQLDB"/>
-+     <property name="hsqldb.vendor" value="The HSQLDB Development Group"/>
-+     <property name="src" value="${basedir}/src"/>
-+     <property name="build.debug" value="off"/>
-+  
-+     </target>
-+  
-+     <target name='explainjars'
+@@ -1,12 +1,21415 @@
 +diff -cr misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java
 +*** misc/hsqldb/src/org/hsqldb/BaseMemoryNode.java	2005-07-17 12:29:06.000000000 +0100
 +--- misc/build/hsqldb/src/org/hsqldb/BaseMemoryNode.java	2005-07-17 12:31:34.000000000 +0100