rpms/openoffice.org/devel openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.2, 1.3 openoffice.org.spec, 1.795, 1.796

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
	openoffice.org.spec 
Log Message:
fix stuff to not link against -lgcj

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 4 files changed, 9 insertions(+), 5 deletions(-)

Index: openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	25 Jul 2006 10:15:22 -0000	1.2
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	26 Jul 2006 10:47:01 -0000	1.3
@@ -1,15 +1,25 @@
 --- openoffice.org.orig/config_office/configure.in	2006-07-20 20:38:59.000000000 +0100
 +++ openoffice.org/config_office/configure.in	2006-07-20 20:41:08.000000000 +0100
-@@ -2236,7 +2236,8 @@
+@@ -2064,7 +2064,9 @@
+       elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then
+         JDK=gcj
+         AC_MSG_RESULT([checked (gcj)]) 
+-        JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
++        if test -z "$JAVA_HOME"; then
++         JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"`
++        fi
+       elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then
+         JDK=bea
+ 
+@@ -2236,7 +2238,7 @@
        AC_CHECK_LIB(jawt, JAWT_GetAWT, [ AWTLIB=-ljawt ] )
     fi
     if test -z "$AWTLIB"; then
 -      AC_MSG_ERROR([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
 +      AC_MSG_WARN([either -lgcjawt or -ljawt with JAWT_GetAWT is required to build wih gcj])
-+      AWTLIB="-ljawt"
+       AWTLIB="-ljawt"
     fi
     AC_SUBST(AWTLIB)
- 
 Index: native/unix/makefile.mk
 ===================================================================
 RCS file: /cvs/api/bean/native/unix/makefile.mk,v
@@ -17,16 +27,19 @@
 diff -u -r1.7 makefile.mk
 --- openoffice.org.orig/bean/native/unix/makefile.mk	16 Jun 2005 14:38:39 -0000	1.7
 +++ openoffice.org/bean/native/unix/makefile.mk	21 Jul 2006 08:58:02 -0000
-@@ -27,7 +27,8 @@
- 
+@@ -28,9 +28,9 @@
  SHL1TARGET=$(TARGET)
  SHL1LIBS=	$(SLB)$/$(TARGET).lib
--SHL1STDLIBS=$(AWTLIB)
-+SHL1STDLIBS=-L/usr/lib/gcj-4.1.1 $(AWTLIB)
-+SHL1NOCHECK=yes
- .IF "$(JDK)" == "gcj"
- SHL1STDLIBS+=-lgcj
- .ENDIF
+ SHL1STDLIBS=$(AWTLIB)
+-.IF "$(JDK)" == "gcj"
+-SHL1STDLIBS+=-lgcj
+-.ENDIF
++#.IF "$(JDK)" == "gcj"
++#SHL1STDLIBS+=-lgcj
++#.ENDIF
+ 
+ .IF "$(OS)" == "LINUX"
+ .IF "$(CPUNAME)" == "S390"
 --- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:37:37.000000000 +0100
 +++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	2006-07-20 22:40:28.000000000 +0100
 @@ -69,9 +69,11 @@


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.795
retrieving revision 1.796
diff -u -r1.795 -r1.796
--- openoffice.org.spec	26 Jul 2006 09:11:15 -0000	1.795
+++ openoffice.org.spec	26 Jul 2006 10:47:01 -0000	1.796
@@ -3361,7 +3361,7 @@
 - rh#199665# -> openoffice.org-2.0.3.ooo67658.sfx2.reloadcrash.patch
 - rh#199894# -> openoffice.org-2.0.3.ooo67716.svx.overflow.patch
 - rh#199870# ->openoffice.org-2.0.3.gccXXXXX.basegfx.crash.patch
-- rh#198337# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
+- rh#199907# -> openoffice.org-2.0.3.ooo67740.xmlhelp.doublefree.patch
 - rh#200059# -> openoffice.org-2.0.3.ooo67337.sfx2.dontshowbuttons.patch
 - rh#200055# -> openoffice.org-2.0.3.ooo67750.sfx2.dontexpandtitle.patch
 - drop openoffice.org.2.0.3-gcc28409.anonymousexternc.patch