[libreoffice] Resolves: rhbz#1092589 Thoroughly check whether JRE is still present

[sbergmann]

commit e987cc993babdc5631a17124cf1c7b953130fdc6
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu May 8 13:23:39 2014 +0200

    Resolves: rhbz#1092589 Thoroughly check whether JRE is still present

 ...bz-1092589-Thoroughly-check-whether-JRE-i.patch |   45 ++++++++++++++++++++
 libreoffice.spec                                   |    6 ++-
 2 files changed, 50 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch b/0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch
new file mode 100644
index 0000000..1a14b4d
--- /dev/null
+++ b/0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch
@@ -0,0 +1,45 @@
+From e419b05d3ec7a4758c14e5653f11a23be4d162ff Mon Sep 17 00:00:00 2001
+From: Stephan Bergmann <sbergman at redhat.com>
+Date: Thu, 8 May 2014 13:10:46 +0200
+Subject: [PATCH] Resolves: rhbz#1092589 Thoroughly check whether JRE is still
+ present
+
+...not only on Mac OS X.  Was able to reproduce this on Fedora 20 where current
+JRE was /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.5.x86_64 but for whatever reason
+there was also a left-behind /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.0.x86_64 tree
+(containing just a handful of sub-dirs, but no real content) that was still
+recorded in my ~/.config/libreoffice/4/user/config/javasettings_Linux_X86_64.xml
+
+Change-Id: Ie477c5a506a430f6c29525f6c558dbc18bbf1c48
+(cherry picked from commit f5ed2f4e926016d23617355c94dd2292b40e6986)
+---
+ jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+index a3449c3..d3650f9 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+@@ -765,10 +765,10 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+     {
+         ret = JFW_PLUGIN_E_ERROR;
+     }
+-#ifdef MACOSX
+     //We can have the situation that the JavaVM runtime library is not
+     //contained within JAVA_HOME. Then the check for JAVA_HOME would return
+     //true although the runtime library may not be loadable.
++    //Or the JAVA_HOME directory of a deinstalled JRE left behind.
+     if (ret == JFW_PLUGIN_E_NONE && *exist == sal_True)
+     {
+         OUString sRuntimeLib = getRuntimeLib(pInfo->arVendorData);
+@@ -796,7 +796,6 @@ javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+                        + sRuntimeLib + " \n");
+         }
+     }
+-#endif
+     return ret;
+ }
+ 
+-- 
+1.9.0
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 78f1cb1..df9248e 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -37,7 +37,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        4%{?libo_prerelease}%{?dist}
+Release:        5%{?libo_prerelease}%{?dist}
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and Artistic and MPLv2.0
 Group:          Applications/Productivity
 URL:            http://www.libreoffice.org/
@@ -298,6 +298,7 @@ Patch37: 0001-Related-rhbz-1032774-slide-restarter-should-disable-.patch
 Patch38: 0001-add-X-TryExec-entries-to-desktop-files.patch
 Patch39: 0001-resolved-fdo-78294-default-null-date-for-document-im.patch
 Patch40: 0001-Related-fdo-36815-clip-overlarge-comment-contents.patch
+Patch41: 0001-Resolves-rhbz-1092589-Thoroughly-check-whether-JRE-i.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -2261,6 +2262,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %endif
 
 %changelog
+* Thu May 08 2014 Stephan Bergmann <sbergman at redhat.com> - 1:4.2.4.2-5
+- Resolves: rhbz#1092589 Thoroughly check whether JRE is still present
+
 * Tue May 06 2014 Caolán McNamara <caolanm at redhat.com> - 1:4.2.4.2-4
 - clip over-long comments