rpms/openoffice.org/devel openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch, NONE, 1.1 openoffice.org.spec, 1.159, 1.160

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch 
Log Message:
add db patch to configure

openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch:
 db-4.2.52.patch |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+)

--- NEW FILE openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch ---
Index: db-4.2.52.patch
===================================================================
RCS file: /cvs/external/berkeleydb/db-4.2.52.patch,v
retrieving revision 1.4
diff -u -r1.4 db-4.2.52.patch
--- openoffice.org.orig/berkleydb/db-4.2.52.patch	18 Apr 2005 14:22:20 -0000	1.4
+++ openoffice.org/berkleydb/db-4.2.52.patch	25 Apr 2005 09:12:33 -0000
@@ -877,3 +877,21 @@
 ! 			$(SLO)$/xa_map.obj
 ! 
 ! .INCLUDE :  target.mk
+*** misc/db-4.2.52.NC/dist/configure	2005-04-25 09:53:58.000000000 +0100
+--- misc/build/db-4.2.52.NC/dist/configure	2005-04-25 09:58:04.000000000 +0100
+***************
+*** 20904,20916 ****
+  	esac
+  	echo "$as_me:$LINENO: result: $JAVA_VERSION" >&5
+  echo "${ECHO_T}$JAVA_VERSION" >&6
+- 	case "$JAVA_VERSION" in
+- 	1.[3456789]* | 1.[1-9][0-9]* | [23456789]* ) ;;
+- 	* )
+- 		{ { echo "$as_me:$LINENO: error: Java version 1.3 or higher required, got $JAVA_VERSION" >&5
+- echo "$as_me: error: Java version 1.3 or higher required, got $JAVA_VERSION" >&2;}
+-    { (exit 1); exit 1; }; } ;;
+- 	esac
+  
+  	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
+  	do
+--- 20904,20909 ----


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- openoffice.org.spec	25 Apr 2005 08:10:32 -0000	1.159
+++ openoffice.org.spec	25 Apr 2005 09:06:41 -0000	1.160
@@ -89,6 +89,7 @@
 Patch37: openoffice.org-1.9.93.gccXXXXX.broken.patch
 Patch38: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 Patch39: workspace.mhu06.patch
+Patch40: openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -677,6 +678,7 @@
 #%patch37 -p1 -b .gccXXXXX.broken.patch
 %patch38 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 %patch39 -p1 -b .workspace.mhu06.patch
+%patch40 -p1 -b .dbXXXXX.configureerror.berkleydb.patch
 
 tar xvzf %{SOURCE1}
 %build
@@ -2422,6 +2424,8 @@
 - pointless to ship partial translated kn_IN without fonts which can
   even display them
 - backport workspace.mhu06 to bring back the gnome filedialog that got whacked
+- add openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch to
+  try and move to db4 with latest gcc4
 
 * Thu Apr 21 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.93-1
 - bump to next version