From 58ee288472e7c69a5d806644a33f4ae1a43c24e6924f4cadd894d07159161b60 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 1 Oct 2019 09:16:24 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/mysql-connector-java?expand=0&rev=53

---
 mysql-connector-java.changes |  6 ++++++
 mysql-connector-java.spec    | 25 +++++++++----------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/mysql-connector-java.changes b/mysql-connector-java.changes
index 8b45403..bbca971 100644
--- a/mysql-connector-java.changes
+++ b/mysql-connector-java.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct  1 09:15:34 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the new compatibility packages log4j12/log4j12-mini
+- Clean the spec file by spec-cleaner
+
 -------------------------------------------------------------------
 Mon Nov  5 15:22:11 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/mysql-connector-java.spec b/mysql-connector-java.spec
index 657cb9e..c4400fd 100644
--- a/mysql-connector-java.spec
+++ b/mysql-connector-java.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package mysql-connector-java
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -21,8 +21,7 @@ Version:        5.1.47
 Release:        0
 Summary:        Official JDBC Driver for MySQL
 License:        GPL-2.0-or-later
-Group:          Development/Libraries/Java
-Url:            http://dev.mysql.com/downloads/connector/j/
+URL:            https://dev.mysql.com/downloads/connector/j/
 Source0:        %{name}-%{version}-suse.tar.xz
 # Script to repack upstream tarball
 # ./generate-tarball.sh VERSION
@@ -41,11 +40,11 @@ BuildRequires:  java-devel >= 1.8
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
-BuildRequires:  log4j-mini
+BuildRequires:  log4j12-mini
 BuildRequires:  slf4j
 BuildRequires:  xz
 Requires:       jta >= 1.0
-Requires:       log4j
+Requires:       log4j12
 Requires:       slf4j
 Provides:       mm.mysql = %{version}
 Obsoletes:      mm.mysql < %{version}
@@ -101,8 +100,8 @@ export CLASSPATH=$(build-classpath \
     jdbc-stdext\
     jta \
     junit \
-    log4j)
-ant \
+    log4j12/log4j-12)
+%{ant} \
     -Dcom.mysql.jdbc.jdk5.javac=%javac \
     -Dcom.mysql.jdbc.jdk8.javac=%javac \
     -Dsnapshot.version= \
@@ -127,14 +126,8 @@ sed -i 's/>@.*</>%{version}</' %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
 %add_maven_depmap JPP-%{name}.pom %{name}.jar
 
-%files
-%doc CHANGES COPYING README.txt
-%attr(0644,root,root) %{_javadir}/%{name}.jar
-%if %{defined _maven_repository}
-%config(noreplace) %{_mavendepmapfragdir}/*
-%else
-%config(noreplace) %{_datadir}/maven-metadata/%{name}.xml*
-%endif
-%{_mavenpomdir}/*.pom
+%files -f .mfiles
+%license COPYING
+%doc CHANGES README.txt
 
 %changelog