rpms/openoffice.org/devel openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch, NONE, 1.1 openoffice.org.spec, 1.1286, 1.1287 openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch, 1.4, NONE

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch 
Removed Files:
	openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch 
Log Message:
remove gcj assumptions

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

--- NEW FILE openoffice.org-2.0.0.rh171692.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: plugins/sunmajor/pluginlib/gnujre.cxx
===================================================================
RCS file: /cvs/udk/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx,v
retrieving revision 1.12
diff -u -r1.12 gnujre.cxx
--- openoffice.org.orig/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Sep 2006 10:54:01 -0000	1.12
+++ openoffice.org/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx	27 Nov 2006 16:04:59 -0000
@@ -67,7 +67,6 @@
 {
     static char const* ar[]= {
           "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
-          "/gcj-4.1.1/libjvm.so",
           "/libgcj.so.7",
           "/libgcj.so.6"
     };


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1286
retrieving revision 1.1287
diff -u -r1.1286 -r1.1287
--- openoffice.org.spec	4 Sep 2007 16:01:34 -0000	1.1286
+++ openoffice.org.spec	4 Sep 2007 17:34:53 -0000	1.1287
@@ -50,7 +50,7 @@
 Source6:        http://tools.openoffice.org/unowinreg_prebuild/680/unowinreg.dll
 BuildRequires:	tcsh, zip, findutils, autoconf, flex, bison, ant, icu, gcc-c++
 BuildRequires:  perl-Compress-Zlib binutils, gcc-java, unixODBC-devel, xalan-j2
-BuildRequires:	gdb, libgcj-devel, java-devel, zlib-devel, xerces-j2, prelink
+BuildRequires:	gdb, java-devel, zlib-devel, xerces-j2, prelink, vigra-devel
 BuildRequires:	freetype-devel, gtk2-devel, gnome-vfs2-devel, cups-devel, bsh
 BuildRequires:	curl-devel, boost-devel, python-devel, expat-devel, libXt-devel
 BuildRequires:	libxml2-devel, neon-devel >= 0.27.0, libidn-devel, pam-devel
@@ -58,7 +58,7 @@
 BuildRequires:  evolution-data-server-devel, libxslt-devel, desktop-file-utils
 BuildRequires:  libxslt-devel, db4-devel, firefox-devel, libwpd-devel, hsqldb
 BuildRequires:  gstreamer-devel, gstreamer-plugins-base-devel, libicu-devel
-BuildRequires:  perl-Archive-Zip, libtextcat-devel, vigra-devel
+BuildRequires:  perl-Archive-Zip, libtextcat-devel
 
 Patch0:  openoffice.org-simple-crash_report.sh
 Patch1:  AutoSaveRecovery.xcu
@@ -76,7 +76,7 @@
 %if %{gtkprintui}
 Patch13: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.patch
 %endif
-Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.defaulttogcj.patch
+Patch14: openoffice.org-2.0.0.rh171692.jvmfwk.retryjvm.patch
 Patch15: openoffice.org-2.0.1.rhXXXXXX.extensions.defaulttoevo2.patch
 Patch16: openoffice.org-1.9.129.ooo54603.fontconfig.patch
 Patch17: openoffice.org-1.9.115.ooo69368.fixxmlsec.patch
@@ -146,8 +146,8 @@
 Group: Applications/Productivity
 Requires: liberation-fonts
 Requires: hunspell-en
-Requires: libgcj >= 4.0.0, bsh, java = 1.5.0
-Requires: hsqldb >= 1.80.1, xalan-j2, xerces-j2
+Requires: bsh, java >= 1.5.0
+Requires: hsqldb, xalan-j2, xerces-j2
 PreReq: desktop-file-utils >= 0.9, gtk2 >= 2.9.4
 Obsoletes: openoffice.org
 Obsoletes: openoffice.org-libs
@@ -283,7 +283,7 @@
 Summary: Software Development Kit for %{name}
 Group: Development/Libraries
 Requires: %{name}-core = %{epoch}:%{version}-%{release}
-Requires: unzip, java-1.5.0-gcj-devel
+Requires: unzip, java-devel
 
 %description sdk
 The %{name} SDK is an add-on for the %{name} office suite. It provides the necessary tools for programming using the %{name} APIs and for creating extensions (UNO components) for %{name}.
@@ -1007,7 +1007,7 @@
 %if %{gtkprintui}
 %patch13 -p1 -b .rh127576.gtkunixprintdialog.patch
 %endif
-%patch14 -p1 -b .rh171692.jvmfwk.defaulttogcj.patch
+%patch14 -p1 -b .rh171692.jvmfwk.retryjvm.patch
 %patch15 -p1 -b .rhXXXXXX.extensions.defaulttoevo2.patch
 %patch16 -p1 -b .ooo54603.fontconfig.patch
 %patch17 -p1 -b .ooo69368.fixxmlsec.patch


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