Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package mysql-connector-java for
openSUSE:Factory checked in at 2023-06-07 23:06:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/mysql-connector-java (Old)
and /work/SRC/openSUSE:Factory/.mysql-connector-java.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mysql-connector-java"
Wed Jun 7 23:06:32 2023 rev:44 rq:1091133 version:8.0.33
Changes:
--------
---
/work/SRC/openSUSE:Factory/mysql-connector-java/mysql-connector-java.changes
2023-05-12 20:34:17.720937263 +0200
+++
/work/SRC/openSUSE:Factory/.mysql-connector-java.new.15902/mysql-connector-java.changes
2023-06-07 23:07:01.987207865 +0200
@@ -1,0 +2,6 @@
+Tue Jun 6 16:58:51 UTC 2023 - Fridrich Strba <[email protected]>
+
+- Wrap the reload4j/log4j dependencies in conditions, so that the
+ package can be built on SLE12.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ mysql-connector-java.spec ++++++
--- /var/tmp/diff_new_pack.Gs8coZ/_old 2023-06-07 23:07:02.751212301 +0200
+++ /var/tmp/diff_new_pack.Gs8coZ/_new 2023-06-07 23:07:02.755212324 +0200
@@ -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 @@
# 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,11 +47,9 @@
BuildRequires: javassist >= 3.28.0
BuildRequires: junit
BuildRequires: protobuf-java >= 3.9.2
-BuildRequires: reload4j
BuildRequires: slf4j
BuildRequires: xz
Requires: jta >= 1.0
-Requires: reload4j
Requires: slf4j
Provides: mm.mysql = %{version}
Obsoletes: mm.mysql < %{version}
@@ -62,6 +59,13 @@
Provides: %{name}-manual = %{version}
Obsoletes: %{name}-manual < %{version}
BuildArch: noarch
+%if 0%{?suse_version} < 1500
+BuildRequires: log4j
+Requires: log4j
+%else
+BuildRequires: reload4j
+Requires: reload4j
+%endif
%description
MySQL Connector/J is a native Java driver that converts JDBC (Java
@@ -83,7 +87,7 @@
# 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 +119,8 @@
-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
