rpms/openoffice.org/devel openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, 1.2, 1.3 openoffice.org.spec, 1.611, 1.612

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 
	openoffice.org.spec 
Log Message:
rh#179256# re-detect java with original selection dissappears

openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch:
 distributions/OpenOfficeorg/javavendors_linux.xml        |    0 
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml |    8 ++++----
 source/javavm/javavm.cxx                                 |    0 
 stoc/source/javavm/javavm.cxx                            |    3 +++
 4 files changed, 7 insertions(+), 4 deletions(-)

Index: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch	7 Nov 2005 12:18:22 -0000	1.2
+++ openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch	30 Jan 2006 15:01:18 -0000	1.3
@@ -36,3 +36,34 @@
    <library vendor="BEA Systems, Inc.">sunjavaplugin.so</library>
   </plugins>
  </javaSelection>
+Index: source/javavm/javavm.cxx
+===================================================================
+RCS file: /cvs/udk/stoc/source/javavm/javavm.cxx,v
+retrieving revision 1.72
+diff -u -p -u -r1.72 javavm.cxx
+--- openoffice.org.orig/stoc/source/javavm/javavm.cxx	3 Jan 2006 12:44:05 -0000	1.72
++++ openoffice.org/stoc/source/javavm/javavm.cxx	30 Jan 2006 10:12:21 -0000
+@@ -868,6 +868,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+         {
+         case JFW_E_NONE: bStarted = true; break;
+         case JFW_E_NO_SELECT:
++        case JFW_E_VM_CREATION_FAILED:
+         {
+             // No Java configured. We silenty run the java configuration
+             // Java.
+@@ -934,6 +935,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+             continue;
+             break;
+         }
++#if 0
+         case JFW_E_VM_CREATION_FAILED:
+         {
+             //Error:
+@@ -950,6 +952,7 @@ JavaVirtualMachine::getJavaVM(css::uno::
+             askForRetry(css::uno::makeAny(exc));
+             return css::uno::Any();
+         }
++#endif
+         case JFW_E_RUNNING_JVM:
+         {
+             //This service should make sure that we do not start java twice.


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.611
retrieving revision 1.612
diff -u -r1.611 -r1.612
--- openoffice.org.spec	27 Jan 2006 17:14:03 -0000	1.611
+++ openoffice.org.spec	30 Jan 2006 15:01:18 -0000	1.612
@@ -3380,11 +3380,12 @@
 * Fri Jan 27 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-9
 - add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X
 - missing %defattr(-,root,root)
+- rh#179256# if java fails (i.e. was configured to use libgcj.so.6) reconfigure
+  to pick up libgcj.so.7
+
 
 * Thu Jan 26 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-8
 - rh#178971# defer exec mem until bridge code
-- add openoffice.org-2.0.2.ooo61178.ucb.neon25.patch for future neon 0.25.X
-- missing %defattr(-,root,root)
 
 * Tue Jan 17 2006 Caolan McNamara <caolanm at redhat.com> - 1:2.0.1.1-7
 - rh#177933# add Serbian sr_CS language pack