rpms/openoffice.org/devel revert.this.for.now.patch, NONE, 1.1 hsqldb.fix2.patch, 1.1, 1.2 openoffice.org.spec, 1.246, 1.247

Wed Jun 22 15:20:59 UTC 2005

Author: caolanm

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

Modified Files:
	hsqldb.fix2.patch openoffice.org.spec 
Added Files:
	revert.this.for.now.patch 
Log Message:
X

revert.this.for.now.patch:
 com/sun/star/comp/bridge/makefile.mk           |    0 
 source/bridgetest/makefile.mk                  |    0 
 testtools/com/sun/star/comp/bridge/makefile.mk |    2 -
 testtools/source/bridgetest/makefile.mk        |   28 +++++++++++++------------
 4 files changed, 16 insertions(+), 14 deletions(-)

--- NEW FILE revert.this.for.now.patch ---
Index: com/sun/star/comp/bridge/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/com/sun/star/comp/bridge/makefile.mk,v
retrieving revision 1.4
diff -u -p -r1.4 makefile.mk
--- openoffice.org.orig/testtools/com/sun/star/comp/bridge/makefile.mk	17 Jun 2005 09:42:10 -0000	1.4
+++ openoffice.org/testtools/com/sun/star/comp/bridge/makefile.mk	22 Jun 2005 15:12:16 -0000
@@ -83,7 +83,7 @@ JAVACLASSFILES= \
 JAVAFILES		= $(subst,$(CLASSDIR)$/$(PACKAGE)$/, $(subst,.class,.java $(JAVACLASSFILES))) 
 
 
-JARCLASSDIRS	= $(PACKAGE) test$/testtools$/bridgetest
+JARCLASSDIRS	= $(PACKAGE)
 JARTARGET		= testComponent.jar
 JARCOMPRESS 	= TRUE
 CUSTOMMANIFESTFILE = manifest
Index: source/bridgetest/makefile.mk
===================================================================
RCS file: /cvs/udk/testtools/source/bridgetest/makefile.mk,v
retrieving revision 1.21
diff -u -p -r1.21 makefile.mk
--- openoffice.org.orig/testtools/source/bridgetest/makefile.mk	17 Jun 2005 09:42:46 -0000	1.21
+++ openoffice.org/testtools/source/bridgetest/makefile.mk	22 Jun 2005 15:12:16 -0000
@@ -210,21 +210,24 @@ $(DLLDEST)$/bridgetest_javaserver$(BATCH
 		> $@
 	$(GIVE_EXEC_RIGHTS) $@
 
-.IF "$(GUI)" == "WNT"
-FILEURLPREFIX = file:///
-.ELSE
-FILEURLPREFIX = file://
-.ENDIF
-
 $(DLLDEST)$/bridgetest_inprocess_java$(BATCH_SUFFIX) : makefile.mk
 	-rm -f $@
+.IF "$(GUI)"=="WNT"
+	+echo set CLASSPATH=$(MY_CLASSPATH) >> $@
+.ELSE
+	+echo "CLASSPATH=$(MY_CLASSPATH); export CLASSPATH" >> $@
+.ENDIF
 	+echo uno -ro uno_services.rdb -ro uno_types.rdb \
-        -s com.sun.star.test.bridge.BridgeTest \
-        $(subst,$/,/ -env:URE_INTERNAL_JAVA_DIR=$(FILEURLPREFIX)$(SOLARBINDIR)) \
-        -- com.sun.star.test.bridge.JavaTestObject > $@
+	   -s com.sun.star.test.bridge.BridgeTest -- com.sun.star.test.bridge.JavaTestObject >> $@
 	$(GIVE_EXEC_RIGHTS) $@
 .ENDIF
 
+.IF "$(GUI)" == "WNT"
+FILEURLPREFIX = file:///
+.ELSE
+FILEURLPREFIX = file://
+.ENDIF
+
 $(DLLDEST)$/uno_services.rdb .ERRREMOVE: $(DLLDEST)$/uno_types.rdb \
         $(DLLDEST)$/bridgetest.uno$(DLLPOST) $(DLLDEST)$/cppobj.uno$(DLLPOST) \
         $(MISC)$/$(TARGET)$/bootstrap.rdb
@@ -236,14 +239,13 @@ $(DLLDEST)$/uno_services.rdb .ERRREMOVE:
         -c remotebridge.uno$(DLLPOST) \
         -c uuresolver.uno$(DLLPOST) \
         -c bridgetest.uno$(DLLPOST) \
-        -c cppobj.uno$(DLLPOST) \
-        -c uriproc.uno$(DLLPOST)
+        -c cppobj.uno$(DLLPOST) 
 .IF "$(SOLAR_JAVA)" != ""
     $(REGCOMP) -register -br $(DLLDEST)$/uno_types.rdb -r $@ \
         -c javaloader.uno$(DLLPOST) -c javavm.uno$(DLLPOST)
     $(REGCOMP) -register  -br $(MISC)$/$(TARGET)$/bootstrap.rdb -r $@ -c \
         $(subst,$/,/ $(FILEURLPREFIX)$(PWD)$/$(CLASSDIR)$/testComponent.jar) \
-        $(subst,$/,/ -env:URE_INTERNAL_JAVA_DIR=$(FILEURLPREFIX)$(SOLARBINDIR))
+        -classpath $(CLASSPATH)
 .ENDIF
 
 $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRREMOVE:
@@ -251,5 +253,5 @@ $(MISC)$/$(TARGET)$/bootstrap.rdb .ERRRE
     + $(COPY) $(SOLARBINDIR)$/types.rdb $@
 .IF "$(SOLAR_JAVA)" != ""
     $(REGCOMP) -register -r $@ -c javaloader.uno$(DLLPOST) \
-        -c javavm.uno$(DLLPOST) -c uriproc.uno$(DLLPOST)
+        -c javavm.uno$(DLLPOST)
 .ENDIF

hsqldb.fix2.patch:
 hsqldb_1_8_0 |  326 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 156 insertions(+), 170 deletions(-)

Index: hsqldb.fix2.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/hsqldb.fix2.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- hsqldb.fix2.patch	22 Jun 2005 14:59:43 -0000	1.1
+++ hsqldb.fix2.patch	22 Jun 2005 15:20:55 -0000	1.2
@@ -1,5 +1,5 @@
---- openoffice.org.orig/hsqldb/SRC680_m110/hsqldb/hsqldb_1_8_0.post1	2005-06-22 15:40:46.000000000 +0100
-+++ openoffice.org/hsqldb/SRC680_m110/hsqldb/hsqldb_1_8_0	2005-06-22 15:40:57.000000000 +0100
+--- SRC680_m110/hsqldb/hsqldb_1_8_0.post1	2005-06-22 15:40:46.000000000 +0100
++++ SRC680_m110/hsqldb/hsqldb_1_8_0	2005-06-22 15:40:57.000000000 +0100
 @@ -516,7 +516,7 @@
         * @param  type java.sql.Types int for a numeric type
         * @return relative width


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -r1.246 -r1.247
--- openoffice.org.spec	22 Jun 2005 14:59:43 -0000	1.246
+++ openoffice.org.spec	22 Jun 2005 15:20:55 -0000	1.247
@@ -114,6 +114,7 @@
 Patch44: openoffice.org-1.9.111.ooo51091.exportgcjsymbolname.jvmaccess.patch
 Patch45: hsqldb.fix1.patch
 Patch46: hsqldb.fix2.patch
+Patch47: revert.this.for.now.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -739,6 +740,7 @@
 %patch44 -p1 -b .ooo51091.exportgcjsymbolname.jvmaccess.patch
 %patch45 -p1 -b hsqldb.fix1.patch
 %patch46 -p1 -b hsqldb.fix2.patch
+%patch47 -p1 -b revert.this.for.now.patch
 
 #start ludicrous workaround
 #while we include these libs we need this, if/when we move to system


