rpms/openoffice.org/devel workspace.dba23e.patch, NONE, 1.1 openoffice.org.spec, 1.1264, 1.1265

Caolan McNamara (caolanm) fedora-extras-commits at redhat.com
Wed Aug 22 14:32:13 UTC 2007


Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.dba23e.patch 
Log Message:
add workspace.dba23e.patch

workspace.dba23e.patch:

--- NEW FILE workspace.dba23e.patch ---
Index: dba/connectivity/source/drivers/hsqldb/HDriver.cxx
diff -u dba/connectivity/source/drivers/hsqldb/HDriver.cxx:1.23 dba/connectivity/source/drivers/hsqldb/HDriver.cxx:1.23.50.3
--- dba/connectivity/source/drivers/hsqldb/HDriver.cxx:1.23	Mon Mar 12 03:40:59 2007
+++ dba/connectivity/source/drivers/hsqldb/HDriver.cxx	Wed Aug 15 22:34:29 2007
@@ -241,7 +241,15 @@
 				aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClass"));
 				aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.hsqldb.jdbcDriver"));
 				aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JavaDriverClassPath"));
-				aConvertedProperties[nPos++].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar"));
+				aConvertedProperties[nPos++].Value <<= ::rtl::OUString(
+#ifdef SYSTEM_HSQLDB
+					RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR
+					" vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar")
+#else
+					RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$ORIGIN/classes/hsqldb.jar"
+					" vnd.sun.star.expand:$ORIGIN/classes/sdbc_hsqldb.jar")
+#endif
+				);
 				aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsAutoRetrievingEnabled"));
 				aConvertedProperties[nPos++].Value <<= sal_True;
 				aConvertedProperties[nPos].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoRetrievingStatement"));
Index: dba/connectivity/source/drivers/hsqldb/makefile.mk
diff -u dba/connectivity/source/drivers/hsqldb/makefile.mk:1.11 dba/connectivity/source/drivers/hsqldb/makefile.mk:1.11.50.1
--- dba/connectivity/source/drivers/hsqldb/makefile.mk:1.11	Fri Mar  9 00:58:53 2007
+++ dba/connectivity/source/drivers/hsqldb/makefile.mk	Wed Aug  8 01:40:13 2007
@@ -50,6 +50,9 @@
 	@echo "Not building jurt because Java is disabled"
 .ENDIF
 
+.IF "$(SYSTEM_HSQLDB)" == "YES"
+CDEFS+=-DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
+.ENDIF
 # --- Resources ---------------------------------
 
 SRS1NAME=$(TARGET)
Index: installation/scp2/source/ooo/profileitem_ooo.scp
diff -u installation/scp2/source/ooo/profileitem_ooo.scp:1.49 installation/scp2/source/ooo/profileitem_ooo.scp:1.49.14.1
--- installation/scp2/source/ooo/profileitem_ooo.scp:1.49	Thu Jul 26 01:57:23 2007
+++ installation/scp2/source/ooo/profileitem_ooo.scp	Wed Aug  8 02:22:22 2007
@@ -859,7 +859,7 @@
   #endif
 End
 
-#if defined SYSTEM_BSH || defined SYSTEM_HSQLDB || defined SYSTEM_XML_APIS || \
+#if defined SYSTEM_BSH || defined SYSTEM_XML_APIS || \
     defined SYSTEM_XERCES || defined SYSTEM_XALAN || defined SYSTEM_SERIALIZER
 ProfileItem gid_Profileitem_Jvmfwk_Uno_Java_Jfw_Classpath_Urls
     ProfileID = gid_Profile_Jvmfwk_Ini;
@@ -871,20 +871,17 @@
 #ifdef SYSTEM_BSH
     ValueList1 = BSH_JAR;
 #endif
-#ifdef SYSTEM_HSQLDB
-    ValueList2 = HSQLDB_JAR;
-#endif
 #ifdef SYSTEM_XML_APIS
-    ValueList3 = XML_APIS_JAR;
+    ValueList2 = XML_APIS_JAR;
 #endif
 #ifdef SYSTEM_XERCES
-    ValueList4 = XERCES_JAR;
+    ValueList3 = XERCES_JAR;
 #endif
 #ifdef SYSTEM_XALAN
-    ValueList5 = XALAN_JAR;
+    ValueList4 = XALAN_JAR;
 #endif
 #ifdef SYSTEM_SERIALIZER
-    ValueList6 = SERIALIZER_JAR;
+    ValueList5 = SERIALIZER_JAR;
 #endif
 End
 #endif


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1264
retrieving revision 1.1265
diff -u -r1.1264 -r1.1265
--- openoffice.org.spec	22 Aug 2007 14:20:37 -0000	1.1264
+++ openoffice.org.spec	22 Aug 2007 14:31:40 -0000	1.1265
@@ -129,6 +129,7 @@
 Patch64: openoffice.org-2.3.0.ooo80735.cppu.map.patch
 Patch65: openoffice.org-2.3.0.ooo80944.sd.sixtyfour.patch
 Patch66: openoffice.org-2.2.0.gccXXXXX.solenv.javaregistration.patch
+Patch67: workspace.dba23e.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1069,6 +1070,7 @@
 %patch64 -p1 -b .ooo80735.cppu.map.patch
 %patch65 -p1 -b .ooo80944.sd.sixtyfour.patch
 %patch66 -p1 -b .gccXXXXX.solenv.javaregistration.patch
+%patch67 -p1 -b .workspace.dba23e.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2727,6 +2729,7 @@
 %changelog
 * Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.2
 - move vba stuff into calc package
+- add workspace.dba23e.patch
 
 * Wed Aug 22 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-2.1
 - Resolves: rhbz#251896 count from start of ctl sequence, not start of




More information about the fedora-extras-commits mailing list