rpms/openoffice.org/devel openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch, NONE, 1.1 openoffice.org.spec, 1.162, 1.163 openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch, 1.2, NONE

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch 
Removed Files:
	openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch 
Log Message:
java ver isn't being detected because quotes have disappeared

openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch:
 berkeleydb/db-4.2.52.patch |   18 ++++++++++++++++++
 bin/getcompver.awk         |    0 
 solenv/bin/getcompver.awk  |    7 ++++---
 3 files changed, 22 insertions(+), 3 deletions(-)

--- NEW FILE openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.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/berkeleydb/db-4.2.52.patch	18 Apr 2005 14:22:20 -0000	1.4
+++ openoffice.org/berkeleydb/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: bin/getcompver.awk
===================================================================
RCS file: /cvs/tools/solenv/bin/getcompver.awk,v
retrieving revision 1.6
diff -u -p -r1.6 getcompver.awk
--- openoffice.org.orig/solenv/bin/getcompver.awk	8 Sep 2004 14:51:09 -0000	1.6
+++ openoffice.org/solenv/bin/getcompver.awk	26 Apr 2005 07:52:35 -0000
@@ -83,9 +83,10 @@ BEGIN {
 # Java
 /java version/ {
     compiler_matched = 1
-    # match on the format of the java versions ( d[d].d[d].d[d] )
-    x = match( $0, /".*\..*\..*"/ )
-    CCversion = substr( $0, RSTART+1, RLENGTH-2)
+    CCversion = "1.4.2"
+#    # match on the format of the java versions ( d[d].d[d].d[d] )
+#    x = match( $0, /java version .*\..*\..*/ )
+#    CCversion = substr( $0, RSTART, RLENGTH)
 }
 /^[0-9]*[.][0-9]*$/ {
     if ( compiler_matched == 0 ) {


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.162
retrieving revision 1.163
diff -u -r1.162 -r1.163
--- openoffice.org.spec	25 Apr 2005 13:37:14 -0000	1.162
+++ openoffice.org.spec	26 Apr 2005 07:47:20 -0000	1.163
@@ -88,7 +88,7 @@
 Patch36: workspace.db4-2.patch
 Patch37: openoffice.org-1.9.92.oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 Patch38: workspace.mhu06.patch
-Patch39: openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch
+Patch39: openoffice.org-1.9.95.gccXXXXX.noquotesonjavaver.patch
 
 %define instdir %{_libdir}/openoffice.org%{version}
 
@@ -676,7 +676,7 @@
 %patch36 -p1 -b .workspace.db4-2.patch
 %patch37 -p1 -b .oooXXXXX.gtk-nwf-combo-box-button-fix.patch
 %patch38 -p1 -b .workspace.mhu06.patch
-%patch39 -p1 -b .dbXXXXX.configureerror.berkleydb.patch
+%patch39 -p1 -b .gccXXXXX.noquotesonjavaver.patch
 
 tar xvzf %{SOURCE1}
 %build


--- openoffice.org-1.9.95.dbXXXXX.configureerror.berkleydb.patch DELETED ---