From f772ac4b8f9ad188ce264ca94fb6a05d7c77dece91991be5f5db55993fe4fe3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Thu, 18 May 2017 11:11:06 +0000
Subject: [PATCH] - Add patch to relax compiler check:   * javac-check.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=34
---
 javac-check.patch            | 16 ++++++++++++++++
 mysql-connector-java.changes |  2 ++
 mysql-connector-java.spec    |  3 +++
 no-jdk5-requirement.patch    |  4 ++--
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 javac-check.patch

diff --git a/javac-check.patch b/javac-check.patch
new file mode 100644
index 0000000..e9ff401
--- /dev/null
+++ b/javac-check.patch
@@ -0,0 +1,16 @@
+Index: mysql-connector-java-5.1.42/build.xml
+===================================================================
+--- mysql-connector-java-5.1.42.orig/build.xml
++++ mysql-connector-java-5.1.42/build.xml
+@@ -303,10 +303,7 @@ Java 8 (for JDBC 4+ implementation) is a
+         <fail message="Java 8 (for JDBC 4+ implementation) is required. Set the full path to this JDK home with the property 'com.mysql.jdbc.jdk8'. Default: '/usr/lib/jvm/jdk1.8'.">
+             <condition>
+                 <not>
+-                    <and>
+-                        <equals arg1="${jdk8checkexitstatus}" arg2="0" />
+-                        <contains string="${com.mysql.jdbc.jdk8.version}" substring="java version &quot;1.8" casesensitive="true" />
+-                    </and>
++                    <equals arg1="${jdk8checkexitstatus}" arg2="0" />
+                 </not>
+             </condition>
+         </fail>
diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes
index cbe444e..fcb94b1 100644
--- a/mysql-connector-java.changes
+++ b/mysql-connector-java.changes
@@ -10,6 +10,8 @@ Thu May 18 10:42:07 UTC 2017 - tchvatal@suse.com
 - Refresh patch no-jdk5-requirement.patch
 - Attempt to refresh mysql-connector-java-jdbc-4.1.patch
   * Partialy merged by upstream, many conflicts
+- Add patch to relax compiler check:
+  * javac-check.patch
 
 -------------------------------------------------------------------
 Tue May  2 15:20:16 UTC 2017 - pmonrealgonzalez@suse.com
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 55e3d9b..6e1e57b 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -27,6 +27,8 @@ Source0:        %{name}-%{version}-suse.tar.xz
 # Script to repack upstream tarball
 # ./generate-tarball.sh VERSION
 Source99:       generate-tarball.sh
+# PATCH-FIX-SUSE: relax the check for java compiler
+Patch0:         javac-check.patch
 # PATCH-FIX-UPSTREAM: do not require hibernate4 to actually just build
 Patch1:         extra-libs-build.patch
 # PATCH-FIX-SUSE: do not build jdbc3 driver needing too old java
@@ -71,6 +73,7 @@ set that supports the capabilities of MySQL.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch0 -p1
 
 # dup
 rm -f README
diff --git a/no-jdk5-requirement.patch b/no-jdk5-requirement.patch
index dc7931d..b01eae1 100644
--- a/no-jdk5-requirement.patch
+++ b/no-jdk5-requirement.patch
@@ -16,7 +16,7 @@ Index: mysql-connector-java-5.1.42/build.xml
                 debug="${debug.enable}"
                 fork="yes"
 -               executable="${com.mysql.jdbc.jdk5.javac}"
-+               executable="${com.mysql.jdbc.jdk6.javac}"
++               executable="${com.mysql.jdbc.jdk8.javac}"
                 compiler="modern"
                 includeantruntime="false"
                 source="1.5"
@@ -25,7 +25,7 @@ Index: mysql-connector-java-5.1.42/build.xml
                 debug="${debug.enable}"
                 fork="yes"
 -               executable="${com.mysql.jdbc.jdk5.javac}"
-+               executable="${com.mysql.jdbc.jdk6.javac}"
++               executable="${com.mysql.jdbc.jdk8.javac}"
                 compiler="modern"
                 includeantruntime="false"
                 source="1.5"