rpms/openoffice.org/devel openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch 
Log Message:
OOo defaults to the IBM java locations for ppc

openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch:
 bean/native/unix/makefile.mk                 |    6 +++---
 config_office/configure.in                   |    6 ++++--
 config_office/set_soenv.in                   |    7 +++----
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx |    2 ++
 native/unix/makefile.mk                      |    0 
 5 files changed, 12 insertions(+), 9 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	28 Jul 2006 18:44:08 -0000	1.4
+++ openoffice.org-2.0.3.oooXXXXX.jvmfwk.futureproof.patch	30 Jul 2006 10:50:33 -0000	1.5
@@ -54,3 +54,19 @@
            "/lib/libgcj.so.7",
            "/lib/libgcj.so.6"
  #endif
+--- openoffice.org.orig/config_office/set_soenv.in	2006-07-30 10:33:54.000000000 +0100
++++ openoffice.org/config_office/set_soenv.in	2006-07-30 10:35:32.000000000 +0100
+@@ -425,10 +425,9 @@
+       $CPU            = "P";
+       $CPUNAME        = "POWERPC";
+       $OUTPATH        = "unxlngppc";
+-# j2sdk is IBMJava2-ppc-142
+-      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."bin";
+-      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."bin".$ds."classic";
+-      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."bin";
++      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc";
++      $JRETOOLKITDIR  = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."client";
++      $JRETHREADDIR   = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."ppc".$ds."native_threads";
+    }
+    elsif ($platform =~ m/^s390/)
+    {  print "Setting Linux S/390 specific values... ";