From 77d78bc9b418b89f77f3753fc550bae8b708bb11 Mon Sep 17 00:00:00 2001 From: Ondrej Dubaj Date: Thu, 25 Jun 2020 11:26:14 +0200 Subject: [PATCH] Rebase to version 8.0.20 Make compatible with upcoming jdk-11 in rawhide --- .gitignore | 1 + java-version-detection.patch | 25 -------------------- mysql-connector-java.spec | 12 +++++++--- remove-coverage-test.patch | 46 ++++++++++++++++++------------------ sources | 2 +- 5 files changed, 34 insertions(+), 52 deletions(-) delete mode 100644 java-version-detection.patch diff --git a/.gitignore b/.gitignore index 2a4bfae..ef180f9 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /mysql-connector-java-8.0.13-nojars.tar.xz /mysql-connector-java-8.0.15-nojars.tar.xz /mysql-connector-java-8.0.16-nojars.tar.xz +/mysql-connector-java-8.0.20-nojars.tar.xz diff --git a/java-version-detection.patch b/java-version-detection.patch deleted file mode 100644 index e2ef9e3..0000000 --- a/java-version-detection.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 7e9856cdde756339aa184c24cdb3d6a381bb5f11 Mon Sep 17 00:00:00 2001 -From: Jakub Janco -Date: Fri, 22 Feb 2019 11:08:05 +0100 -Subject: [PATCH] Fix version detection - ---- - build.xml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build.xml b/build.xml -index 00b2d7eb..a790ee15 100644 ---- a/build.xml -+++ b/build.xml -@@ -362,7 +362,7 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o - - - -- -+ - - - --- -2.14.4 - diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index f38a33a..02b62cb 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -1,8 +1,8 @@ Summary: Official JDBC driver for MySQL Name: mysql-connector-java -Version: 8.0.16 -Release: 7%{?dist} +Version: 8.0.20 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -46,8 +46,10 @@ BuildRequires: javapackages-local BuildRequires: junit BuildRequires: protobuf-java BuildRequires: slf4j +BuildRequires: java-1.8.0-openjdk-devel Requires: slf4j +Requires: java(-headless) %description MySQL Connector/J is a native Java driver that converts JDBC (Java Database @@ -84,7 +86,7 @@ rm src/test/java/testsuite/regression/ConnectionRegressionTest.java rm src/test/java/testsuite/regression/DataSourceRegressionTest.java rm src/test/java/testsuite/simple/StatementsTest.java -ant -Dcom.mysql.cj.build.jdk=%{java_home} \ +ant -Dcom.mysql.cj.build.jdk=/usr/lib/jvm/java-1.8.0-openjdk \ -Dcom.mysql.cj.extra.libs=%{_javadir} \ test dist @@ -99,6 +101,10 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \ %license LICENSE %changelog +* Thu Jun 25 2020 Ondrej Dubaj - 1:8.0.20-1 +- new upstream release +- compatibility with jdk-11 + * Sun Jun 14 2020 Adrian Reber - 1:8.0.16-7 - Rebuilt for protobuf 3.12 diff --git a/remove-coverage-test.patch b/remove-coverage-test.patch index ba66b51..874113e 100644 --- a/remove-coverage-test.patch +++ b/remove-coverage-test.patch @@ -1,32 +1,32 @@ -From 62f1bf44f6cee0fd97500d6f761a3e03810318df Mon Sep 17 00:00:00 2001 -From: Jakub Janco -Date: Mon, 6 May 2019 15:05:17 +0200 +From 134dadce2a60a2d51d1c2e13d152ec11a419c575 Mon Sep 17 00:00:00 2001 +From: Ondrej Dubaj +Date: Thu, 14 May 2020 13:40:39 +0200 Subject: [PATCH] Remove coverage test --- - build.xml | 133 -------------------------------------------------------------- + build.xml | 133 ------------------------------------------------------ 1 file changed, 133 deletions(-) diff --git a/build.xml b/build.xml -index 7572a4ce..fcce72be 100644 +index 83b6e2c..af374ee 100644 --- a/build.xml +++ b/build.xml -@@ -303,14 +303,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o - - - -- -- -- -- -- -- -- +@@ -338,14 +338,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + + + - +- +- +- +- +- +- +- + - - -@@ -1276,56 +1268,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o + +@@ -1307,56 +1299,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o ${com.mysql.cj.testsuite.message.test.mode} @@ -41,8 +41,8 @@ index 7572a4ce..fcce72be 100644 - fork="on" - forkmode="once" - jvm="${com.mysql.cj.testsuite.jvm.java}" -- errorProperty="com.mysql.cj.testsuite.junit.fail" -- failureProperty="com.mysql.cj.testsuite.junit.fail"> +- errorproperty="com.mysql.cj.testsuite.junit.fail" +- failureproperty="com.mysql.cj.testsuite.junit.fail"> - - - @@ -83,7 +83,7 @@ index 7572a4ce..fcce72be 100644 -@@ -1344,81 +1286,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o +@@ -1375,81 +1317,6 @@ See also com.mysql.cj.conf.PropertyDefinitions.SYSP_* variables for other test o @@ -166,5 +166,5 @@ index 7572a4ce..fcce72be 100644 -- -2.14.5 +2.24.1 diff --git a/sources b/sources index 5752df1..fc6a088 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.16-nojars.tar.xz) = 90aa42bcae5ddd0a48d3c287c8df4f372f6a16ae95fd6cb5d52694f531c830bd8f46f3cfc7f5acd244e28c5ad86b0813a2e34660fbf85d53f5595301dbbf1fc3 +SHA512 (mysql-connector-java-8.0.20-nojars.tar.xz) = afe91a3c20ec58992b326f3a0c5da89ee3f51830082009defbe3f78d2ee4ff62eb63fca11cf86749292095d250f262f3a73026e58a0dd44141dc257dd68acfe4