[libreoffice/f16] add possible fix for detection of java 7

[Caolan McNamara]

commit f9c6819dea0ebd73ac3ad3ef99a464647a5ef9bf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 27 09:26:18 2011 +0100

    add possible fix for detection of java 7

 0001-add-Oracle-Java-1.7.0-recognition.patch |   68 ++++++++++++++++++++++++++
 libreoffice.spec                             |    5 ++-
 2 files changed, 72 insertions(+), 1 deletions(-)
---
diff --git a/0001-add-Oracle-Java-1.7.0-recognition.patch b/0001-add-Oracle-Java-1.7.0-recognition.patch
new file mode 100644
index 0000000..9889535
--- /dev/null
+++ b/0001-add-Oracle-Java-1.7.0-recognition.patch
@@ -0,0 +1,68 @@
+From 549e54fb2f8113502743c443d6deadfe648dede1 Mon Sep 17 00:00:00 2001
+From: Hanno Meyer-Thurow <h.mth at web.de>
+Date: Tue, 13 Sep 2011 13:23:28 +0100
+Subject: [PATCH] add Oracle Java 1.7.0 recognition
+
+---
+ .../OpenOfficeorg/javavendors_linux.xml            |    4 ++++
+ jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx   |    2 ++
+ jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx   |    1 +
+ 3 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+index ed329e5..489511f 100644
+--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
++++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+@@ -9,6 +9,9 @@
+   <vendor name="Sun Microsystems Inc.">
+     <minVersion>1.5.0</minVersion>
+   </vendor>
++  <vendor name="Oracle Corporation">
++    <minVersion>1.7.0</minVersion>
++  </vendor>
+   <vendor name="IBM Corporation">
+     <minVersion>1.5.0</minVersion>
+   </vendor>
+@@ -25,6 +28,7 @@
+ 
+  <plugins>
+   <library vendor="Sun Microsystems Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
++  <library vendor="Oracle Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="IBM Corporation">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="Blackdown Java-Linux Team">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+   <library vendor="Free Software Foundation, Inc.">vnd.sun.star.expand:$URE_INTERNAL_LIB_DIR/sunjavaplugin.so</library>
+diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+index 8567d79..91ad4c6 100644
+--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
++++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+@@ -112,6 +112,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+ 
+     //Only do something if the sunjavaplugin created this JavaInfo
+     rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
++    rtl::OUString sVendor9(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
+     rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
+     rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
+     rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
+@@ -121,6 +122,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
+     rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
+     if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
+             || sVendor2.equals(pInfo->sVendor) == sal_True
++            || sVendor9.equals(pInfo->sVendor) == sal_True
+             || sVendor3.equals(pInfo->sVendor) == sal_True
+             || sVendor4.equals(pInfo->sVendor) == sal_True
+             || sVendor5.equals(pInfo->sVendor) == sal_True
+diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+index f24b6ff..5e87002 100644
+--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
++++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+@@ -52,6 +52,7 @@ namespace jfw_plugin
+  */
+ BEGIN_VENDOR_MAP()
+     VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
++    VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
+     VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
+     VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
+     VENDOR_MAP_ENTRY("Apple Inc.", OtherInfo)
+-- 
+1.7.6.4
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 48617d1..432d6d9 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -129,6 +129,7 @@ Patch34: 0001-fedora-gcc-4.6.1.patch
 Patch35: 0001-make-sure-we-stay-in-array-bounds.patch
 Patch36: 0001-let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
 Patch37: 0001-add-these-back-in-to-silence-the-MAXFILTER-assert.patch
+Patch38: 0001-add-Oracle-Java-1.7.0-recognition.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -808,6 +809,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch35 -p1 -b .make-sure-we-stay-in-array-bounds.patch
 %patch36 -p1 -b .let-Qt-call-XInitThreads-so-that-it-knows-it-s-been-.patch
 %patch37 -p1 -b .add-these-back-in-to-silence-the-MAXFILTER-assert.patch
+%patch38 -p1 -b .add-Oracle-Java-1.7.0-recognition.patch
 
 # these are horribly incomplete--empty translations and copied english
 # strings with spattering of translated strings
@@ -2110,9 +2112,10 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
-* Wed Oct 26 2011 David Tardon <dtardon at redhat.com> - 3.4.3.2-15-UNBUILT
+* Thu Oct 27 2011 Caolán McNamara <caolanm at redhat.com> - 3.4.3.2-15
 - Related: rhbz#748585 throw the additional requires away, because it
   does not help
+- add possible fix for detection of java 7
 
 * Tue Oct 25 2011 David Tardon <dtardon at redhat.com> - 3.4.3.2-14
 - Resolves: rhbz#748585 libreoffice installs Java 7