rpms/openoffice.org/devel openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch, NONE, 1.1 openoffice.org.spec, 1.1508, 1.1509 openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, 1.2, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15218

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch 
Removed Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 
Log Message:
rename patch to upstream id, not that it will *ever* *ever* actually get fixed

openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch:

--- NEW FILE openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch ---
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/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1508
retrieving revision 1.1509
diff -u -r1.1508 -r1.1509
--- openoffice.org.spec	22 May 2008 13:13:40 -0000	1.1508
+++ openoffice.org.spec	22 May 2008 19:28:03 -0000	1.1509
@@ -83,7 +83,7 @@
 %if %{gtkprintui}
 Patch11: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch12: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
+Patch12: openoffice.org-2.0.0.ooo83140.jvmfwk.retryjvm.patch
 Patch13: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch14: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
 Patch15: openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch
@@ -1203,7 +1203,7 @@
 %if %{gtkprintui}
 %patch11 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch12 -p1 -b .rh171692.jvmfwk.retryjvm.patch
+%patch12 -p1 -b .ooo83140.jvmfwk.retryjvm.patch
 %patch13 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch14 -p1 -b .ooo69368.fixxmlsec.patch
 %patch15 -p1 -b .ooo53397.prelinkoptimize.desktop.patch


--- openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch DELETED ---