From e1db7120b2ce6344c239d6ae537b4b291e69fd29 Mon Sep 17 00:00:00 2001 From: Jakub Janco Date: Fri, 22 Feb 2019 11:55:37 +0100 Subject: [PATCH] Update to 8.0.15 --- .gitignore | 1 + java-version-detection.patch | 22 ++++++++++++++++++---- mysql-connector-java.spec | 9 ++++++--- sources | 2 +- 4 files changed, 26 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index ec07ec1..822d353 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /mysql-connector-java-8.0.11-nojars.tar.xz /mysql-connector-java-8.0.12-nojars.tar.xz /mysql-connector-java-8.0.13-nojars.tar.xz +/mysql-connector-java-8.0.15-nojars.tar.xz diff --git a/java-version-detection.patch b/java-version-detection.patch index 6943262..e2ef9e3 100644 --- a/java-version-detection.patch +++ b/java-version-detection.patch @@ -1,11 +1,25 @@ ---- mysql-connector-j-5.1.38/build.xml.orig 2018-05-23 08:15:09.293543900 -0400 -+++ mysql-connector-j-5.1.38/build.xml 2018-05-23 07:24:52.219543900 -0400 -@@ -358,7 +358,7 @@ +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 80ebe67..1561290 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.13 -Release: 2%{?dist} +Version: 8.0.15 +Release: 1%{?dist} Epoch: 1 License: GPLv2 with exceptions URL: http://dev.mysql.com/downloads/connector/j/ @@ -21,7 +21,7 @@ Source0: %{name}-%{version}-nojars.tar.xz # lib/c3p0-0.9.1-pre6.src.zip # lib/jboss-common-jdbc-wrapper.jar # lib/jboss-common-jdbc-wrapper-src.jar -# lib/protobuf-java-2.6.0.jar +# lib/protobuf-java-3.6.1.jar # lib/slf4j-api-1.6.1.jar # # See http://bugs.mysql.com/bug.php?id=28512 for details. @@ -103,6 +103,9 @@ ant -Dcom.mysql.cj.build.jdk=%{java_home} \ %license LICENSE %changelog +* Fri Feb 22 2019 Jakub Janco - 1:8.0.15-1 +- new version + * Fri Feb 01 2019 Fedora Release Engineering - 1:8.0.13-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index a97b0c2..fb7b16d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mysql-connector-java-8.0.13-nojars.tar.xz) = d68a1aef488f384b700f58ba3dadff66c5ed3180355d04bbaba6fbc84316615aafdaa62f9d28e72b45b8cb0198839cbc4557290379bcd5d19bb51534dcc8d019 +SHA512 (mysql-connector-java-8.0.15-nojars.tar.xz) = 47aa37df4029ad5709a0fde5b070a3395065bd7bf8b37180d835133ab56e101d4db4e8865a32949b7e6b7dec12e65c5364f37ca8adf7be86ad03c2c6384c2c03