From 28f0ca738b4b6f1f32f4168f99071372718cec07 Mon Sep 17 00:00:00 2001
From: Michael Simacek <msimacek@redhat.com>
Date: Mon, 13 Feb 2017 11:01:59 +0100
Subject: [PATCH] Fix conditional

---
 apache-commons-logging.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 176b5a5..3e1c01f 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -5,7 +5,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.2
-Release:        8%{?dist}
+Release:        9%{?dist}
 Summary:        Apache Commons Logging
 License:        ASL 2.0
 URL:            http://commons.apache.org/%{base_name}
@@ -61,15 +61,16 @@ Summary:        API documentation for %{name}
 %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
+%pom_xpath_inject "pom:dependency[pom:artifactId='logkit']" '<scope>provided</scope>'
+
 %else
-%pom_remove_dep :avalon-framework
+%pom_remove_dep -r :avalon-framework
+%pom_remove_dep -r :logkit
 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>'
-
 %pom_remove_plugin :cobertura-maven-plugin
 %pom_remove_plugin :maven-scm-publish-plugin
 
@@ -117,6 +118,9 @@ install -pm 644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.po
 # -----------------------------------------------------------------------------
 
 %changelog
+* Mon Feb 13 2017 Michael Simacek <msimacek@redhat.com> - 1.2-9
+- Fix conditional
+
 * Fri Feb 10 2017 Michael Simacek <msimacek@redhat.com> - 1.2-8
 - Use log4j12
 - Add avalon conditional