rpms/openoffice.org/devel openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch, NONE, 1.1 openoffice.org.spec, 1.666, 1.667

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch 
Log Message:
workaround for broken db_java in RHEL-4

openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch:
 target.pmk |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch ---
--- openoffice.org.orig/helpcontent2/util/target.pmk	2006-04-21 09:54:49.000000000 +0100
+++ openoffice.org/helpcontent2/util/target.pmk	2006-04-21 09:55:53.000000000 +0100
@@ -41,7 +41,7 @@
 .ENDIF
 
 .IF "$(SYSTEM_DB)" != "YES"
-JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN)
+JAVA_LIBRARY_PATH= -Djava.library.path=$(SOLARSHAREDBIN) -Dsleepycat.db.libfile=$(SOLARSHAREDBIN)/libdb_java-4.2.so
 .ELSE
 .IF "$(JAVACACHE)" != ""
 CLASSPATH!:=$(my_cp)


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.666
retrieving revision 1.667
diff -u -r1.666 -r1.667
--- openoffice.org.spec	20 Apr 2006 12:42:37 -0000	1.666
+++ openoffice.org.spec	21 Apr 2006 09:04:35 -0000	1.667
@@ -62,7 +62,7 @@
 %define xmlsecflags --with-system-xmlsec
 %endif
 %if %{internaljavabits}
-%define javabitsflags --without-system-hsqldb --without-system-beanshell --with-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
+%define javabitsflags --without-system-hsqldb --without-system-beanshell --without-system-db --without-system-xml-apis --without-system-xerces --without-system-xalan
 %define includingexternals 1
 %else
 %define javabitsflags --with-system-hsqldb --with-system-beanshell --with-system-db --with-system-xml-apis --with-system-xerces --with-system-xalan
@@ -166,8 +166,6 @@
 %if ! %{internaljavabits}
 BuildRequires:	db4-java >= 4.3.28-3, hsqldb >= 1.80.1, bsh >= 1.3.0, xalan-j2
 BuildRequires:	xerces-j2
-%else
-BuildRequires:	db4-java >= 4.2.0
 %endif
 %if ! %{internalicu}
 BuildRequires:  icu >= 3.4, libicu-devel >= 3.4
@@ -209,7 +207,11 @@
 Patch23: workspace.atkbridge.patch
 Patch24: workspace.jaxpapi.patch
 Patch25: workspace.systemjava.patch
+%if ! %{internaljavabits}
 Patch26: workspace.targetedaot.patch
+%else
+Patch26: openoffice.org-2.0.2.rhXXXXX.helpcontent2.baddb.patch
+%endif
 Patch27: openoffice.org-2.0.1.ooo58663.vcl.missingglyph.patch
 Patch28: openoffice.org-2.0.1.ooo58606.sw.pre-edit.patch
 Patch29: openoffice.org-2.0.1-ooo59675.sysui.rtfmimetype.patch
@@ -1122,8 +1124,10 @@
 %patch23 -p1 -b .workspace.atkbridge.patch
 %patch24 -p0 -b .workspace.jaxpapi.patch
 %patch25 -p1 -b .workspace.systemjava.patch
-%ifnarch ppc
+%if ! %{internaljavabits}
 %patch26 -p1 -b .workspace.targetedaot.patch
+%else
+%patch26 -p1 -b .rhXXXXX.helpcontent2.baddb.patch
 %endif
 %patch27 -p1 -b .ooo58663.vcl.missingglyph.patch
 %patch28 -p1 -b .ooo58606.sw.pre-edit.patch