From a6714badb4ae6324740c760a3ab1bf776fa42324b788d94bd7a0e55e0e50670e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Jun 2023 17:00:36 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=80 --- mysql-connector-java.changes | 6 ++++++ mysql-connector-java.spec | 15 +++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index 26c14a9..e201e03 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jun 6 16:58:51 UTC 2023 - Fridrich Strba + +- Wrap the reload4j/log4j dependencies in conditions, so that they + can be built on SLE12. + ------------------------------------------------------------------- Tue Apr 25 07:33:23 UTC 2023 - David Anes diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 148a6fb..93dd1af 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -17,12 +17,12 @@ %define new_name mysql-connector-j - Name: mysql-connector-java Version: 8.0.33 Release: 0 Summary: Official JDBC Driver for MySQL License: GPL-2.0-or-later +Group: Development/Languages/Java URL: https://dev.mysql.com/downloads/connector/j/ Source0: https://github.com/mysql/mysql-connector-j/archive/refs/tags/%{version}.tar.gz#:/%{name}-%{version}.tar.gz # NOTE: @@ -32,7 +32,6 @@ Source0: https://github.com/mysql/mysql-connector-j/archive/refs/tags/%{v # Source from: # https://github.com/mysql/mysql-connector-j/commit/6976d9d779b498c254fc5cab5e69cfc74fc3e4f0 Source1: mysql-connector-java-generated-for-protobuf-3.9.2.tar.xz -Group: Development/Languages/Java Patch0: javac-check.patch # NOTE: Oracle OCI is not packaged yet # The patch doesn't remove the file AuthenticationOciClient.java @@ -48,7 +47,6 @@ BuildRequires: javapackages-local BuildRequires: javassist >= 3.28.0 BuildRequires: junit BuildRequires: protobuf-java >= 3.9.2 -BuildRequires: reload4j BuildRequires: slf4j BuildRequires: xz Requires: jta >= 1.0 @@ -62,6 +60,11 @@ Provides: %{new_name} Provides: %{name}-manual = %{version} Obsoletes: %{name}-manual < %{version} BuildArch: noarch +%if 0%{?suse_version} < 1500 +BuildRequires: log4j +%else +BuildRequires: reload4j +%endif %description MySQL Connector/J is a native Java driver that converts JDBC (Java @@ -83,7 +86,7 @@ set that supports the capabilities of MySQL. # from commit 6976d9d779b498c254fc5cab5e69cfc74fc3e4f0, which is # the last version compatible with that version of protobuf and # are equivalent in functionality -tar -xvf %SOURCE1 -C . +tar -xvf %{SOURCE1} -C . %endif # remove OCI support @@ -115,8 +118,8 @@ export CLASSPATH=$(build-classpath \ -Dant.build.javac.source=1.8 \ -Dant.build.javac.target=1.8 \ -Dcom.mysql.cj.build.jdk=%{java_home} \ - -Dcom.mysql.cj.build.jdk.javac=%{javac} \ - -Dcom.mysql.cj.build.jdk.java=%{java} \ + -Dcom.mysql.cj.build.jdk.javac=%javac \ + -Dcom.mysql.cj.build.jdk.java=%java \ build %install From 14a0217ae4a79e6e66e32acccfec9c6c072983135c4ea5784c45c66c79b17756 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Jun 2023 17:24:01 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=81 --- mysql-connector-java.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec index 93dd1af..bd4c6ec 100644 --- a/mysql-connector-java.spec +++ b/mysql-connector-java.spec @@ -50,7 +50,6 @@ BuildRequires: protobuf-java >= 3.9.2 BuildRequires: slf4j BuildRequires: xz Requires: jta >= 1.0 -Requires: reload4j Requires: slf4j Provides: mm.mysql = %{version} Obsoletes: mm.mysql < %{version} @@ -62,8 +61,10 @@ Obsoletes: %{name}-manual < %{version} BuildArch: noarch %if 0%{?suse_version} < 1500 BuildRequires: log4j +Requires: log4j %else BuildRequires: reload4j +Requires: reload4j %endif %description From df4a492c8d03dbf66f14355ac15492c9bc05dd754a581c5f415e2df92cf85d79 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 6 Jun 2023 17:27:57 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=82 --- mysql-connector-java.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes index e201e03..7b86353 100644 --- a/mysql-connector-java.changes +++ b/mysql-connector-java.changes @@ -1,8 +1,8 @@ ------------------------------------------------------------------- Tue Jun 6 16:58:51 UTC 2023 - Fridrich Strba -- Wrap the reload4j/log4j dependencies in conditions, so that they - can be built on SLE12. +- Wrap the reload4j/log4j dependencies in conditions, so that the + package can be built on SLE12. ------------------------------------------------------------------- Tue Apr 25 07:33:23 UTC 2023 - David Anes