From 105c08446813b97314915dc0cda5651e18fdd40f83fd5a93fcbb6c01a3c75d5e Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 1 Oct 2019 08:56:07 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/axis?expand=0&rev=44

---
 axis.changes | 5 +++++
 axis.spec    | 8 ++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/axis.changes b/axis.changes
index b704084..1b75b71 100644
--- a/axis.changes
+++ b/axis.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct  1 08:55:41 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Build against the new compat package log4j12-mini
+
 -------------------------------------------------------------------
 Thu May  9 13:45:36 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/axis.spec b/axis.spec
index fc1127d..382c769 100644
--- a/axis.spec
+++ b/axis.spec
@@ -64,7 +64,7 @@ BuildRequires:  javamail
 BuildRequires:  javapackages-local
 BuildRequires:  javapackages-tools
 BuildRequires:  junit
-BuildRequires:  log4j-mini
+BuildRequires:  log4j12-mini
 BuildRequires:  servletapi5
 BuildRequires:  unzip
 BuildRequires:  wsdl4j
@@ -76,7 +76,7 @@ Requires:       jakarta-commons-discovery
 Requires:       java
 Requires:       javamail
 Requires:       jaxp_parser_impl
-Requires:       log4j
+Requires:       log4j12
 Requires:       wsdl4j
 Obsoletes:      %{name}-javadoc
 BuildArch:      noarch
@@ -118,7 +118,7 @@ cp %{SOURCE1} %{SOURCE2} %{SOURCE3} .
 
 %build
 [ -z "$JAVA_HOME" ] && export JAVA_HOME=%{_jvmdir}/java
-CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging log4j activation javamail servletapi5)
+CLASSPATH=$(build-classpath wsdl4j commons-discovery commons-httpclient3 commons-logging log4j12/log4j-12 activation javamail servletapi5)
 export CLASSPATH=$CLASSPATH:$(build-classpath oro junit jdepend jimi xml-security jsse httpunit jms castor 2>/dev/null)
 export OPT_JAR_LIST="ant/ant-nodeps"
 ant -Dcompile.ime=true \
@@ -126,7 +126,7 @@ ant -Dcompile.ime=true \
     -Dcommons-discovery.jar=$(build-classpath commons-discovery) \
     -Dcommons-logging.jar=$(build-classpath commons-logging) \
     -Dcommons-httpclient.jar=$(build-classpath commons-httpclient3) \
-    -Dlog4j-core.jar=$(build-classpath log4j) \
+    -Dlog4j-core.jar=$(build-classpath log4j12/log4j-12) \
     -Dactivation.jar=$(build-classpath jaf) \
     -Dmailapi.jar=$(build-classpath javamail/mailapi) \
     -Dxerces.jar=$(build-classpath jaxp_parser_impl) \