From 6fa70865f25bac3a53b50365a850923337c454159692be38cd6b7bb1b546eed9 Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Fri, 19 Oct 2018 20:36:10 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-logging?expand=0&rev=34

---
 apache-commons-logging.changes |  5 +++++
 apache-commons-logging.spec    | 22 ++++++++++------------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/apache-commons-logging.changes b/apache-commons-logging.changes
index 148d4c7..6c992af 100644
--- a/apache-commons-logging.changes
+++ b/apache-commons-logging.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Oct 19 20:35:40 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Cleanup of maven pom files installation
+
 -------------------------------------------------------------------
 Tue May 15 10:56:40 UTC 2018 - fstrba@suse.com
 
diff --git a/apache-commons-logging.spec b/apache-commons-logging.spec
index 598081c..78bd2fe 100644
--- a/apache-commons-logging.spec
+++ b/apache-commons-logging.spec
@@ -13,7 +13,7 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
@@ -64,11 +64,6 @@ logging implementation.
 %patch0 -p1
 %patch1 -p1
 
-# 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
-%pom_add_dep avalon-framework:avalon-framework-impl:4.3:test
-
 sed -i 's/\r//' RELEASE-NOTES.txt LICENSE.txt
 
 #FIXME
@@ -100,18 +95,21 @@ popd
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}.pom
-install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/JPP-%{short_name}-api.pom
+install -pm 644 pom.xml %{buildroot}/%{_mavenpomdir}/%{short_name}.pom
+install -pm 644 %{SOURCE3} %{buildroot}/%{_mavenpomdir}/%{short_name}-api.pom
 
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging"
-%add_maven_depmap JPP-%{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
+%add_maven_depmap %{short_name}.pom %{short_name}.jar -a "org.apache.commons:commons-logging"
+%add_maven_depmap %{short_name}-api.pom %{short_name}-api.jar -a "org.apache.commons:commons-logging-api"
 
 %files
 %defattr(0644,root,root,0755)
 %doc PROPOSAL.html LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
 %{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavenpomdir}/JPP-%{short_name}-api.pom
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
 %{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %changelog