From cfe1c2b0704d4f5b4774b69dd4883733bba5095e Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Fri, 10 Feb 2017 13:56:57 +0100
Subject: [PATCH] Use log4j12

- Add avalon conditional
---
 apache-commons-logging.spec | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index af61ee8..176b5a5 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -1,13 +1,11 @@
-# READ BEFORE UPDATING: After updating this package to new upstream
-# version eclipse-ecf should be rebuilt.  For more info, see:
-# https://fedoraproject.org/wiki/SIGs/Java#Package_Update.2FRebuild_Notes
+%bcond_without  avalon
 
 %global base_name  logging
 %global short_name commons-%{base_name}
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -18,12 +16,14 @@ Patch0:         0001-Generate-different-Bundle-SymbolicName-for-different.patch
 Patch1:         0002-Port-to-maven-jar-plugin-3.0.0.patch
 
 BuildRequires:  maven-local
+%if %{with avalon}
 BuildRequires:  mvn(avalon-framework:avalon-framework-api)
 BuildRequires:  mvn(avalon-framework:avalon-framework-impl)
+BuildRequires:  mvn(logkit:logkit)
+%endif
 BuildRequires:  mvn(javax.servlet:servlet-api)
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(log4j:log4j)
-BuildRequires:  mvn(logkit:logkit)
+BuildRequires:  mvn(log4j:log4j:12)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-failsafe-plugin)
 BuildRequires:  mvn(org.apache.maven.plugins:maven-dependency-plugin)
@@ -56,10 +56,17 @@ Summary:        API documentation for %{name}
 %patch0 -p1
 %patch1 -p1
 
+%if %{with avalon}
 # Sent upstream https://issues.apache.org/jira/browse/LOGGING-143
 %pom_remove_dep :avalon-framework
 %pom_add_dep avalon-framework:avalon-framework-api:4.3:provided
 %pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
+%else
+%pom_remove_dep :avalon-framework
+rm -r src/test/java/org/apache/commons/logging/{avalon,logkit}
+rm src/main/java/org/apache/commons/logging/impl/AvalonLogger.java
+rm src/main/java/org/apache/commons/logging/impl/LogKitLogger.java
+%endif
 
 %pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
 
@@ -110,6 +117,10 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
+- Use log4j12
+- Add avalon conditional
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild