pool/mysql-connector-java
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Add patch to relax compiler check:

Browse Source 
* javac-check.patch

OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=34
This commit is contained in:
Tomáš Chvátal 2017-05-18 11:11:06 +00:00 committed by Git OBS Bridge
parent 94b1cd0d11
commit f772ac4b8f
4 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
javac-check.patch Normal file
View File

@ -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>

2
mysql-connector-java.changes
View File

@ -10,6 +10,8 @@ Thu May 18 10:42:07 UTC 2017 - tchvatal@suse.com
- Refresh patch no-jdk5-requirement.patch - Refresh patch no-jdk5-requirement.patch
- Attempt to refresh mysql-connector-java-jdbc-4.1.patch - Attempt to refresh mysql-connector-java-jdbc-4.1.patch
* Partialy merged by upstream, many conflicts * 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 Tue May 2 15:20:16 UTC 2017 - pmonrealgonzalez@suse.com

3
mysql-connector-java.spec
View File

@ -27,6 +27,8 @@ Source0: %{name}-%{version}-suse.tar.xz
# Script to repack upstream tarball # Script to repack upstream tarball
# ./generate-tarball.sh VERSION # ./generate-tarball.sh VERSION
Source99: generate-tarball.sh 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 # PATCH-FIX-UPSTREAM: do not require hibernate4 to actually just build
Patch1: extra-libs-build.patch Patch1: extra-libs-build.patch
# PATCH-FIX-SUSE: do not build jdbc3 driver needing too old java # 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 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1 %patch4 -p1
%patch0 -p1
# dup # dup
rm -f README rm -f README

4
no-jdk5-requirement.patch
View File

@ -16,7 +16,7 @@ Index: mysql-connector-java-5.1.42/build.xml
debug="${debug.enable}" debug="${debug.enable}"
fork="yes" fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}" - executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}" + executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern" compiler="modern"
includeantruntime="false" includeantruntime="false"
source="1.5" source="1.5"
@ -25,7 +25,7 @@ Index: mysql-connector-java-5.1.42/build.xml
debug="${debug.enable}" debug="${debug.enable}"
fork="yes" fork="yes"
- executable="${com.mysql.jdbc.jdk5.javac}" - executable="${com.mysql.jdbc.jdk5.javac}"
+ executable="${com.mysql.jdbc.jdk6.javac}" + executable="${com.mysql.jdbc.jdk8.javac}"
compiler="modern" compiler="modern"
includeantruntime="false" includeantruntime="false"
source="1.5" source="1.5"