From 05a1bc446b246373dbaebd978965aa127d55c180dbbe8cbbf1f0817174a1934b Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Tue, 23 Oct 2018 17:31:05 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-beanutils?expand=0&rev=18

---
 apache-commons-beanutils.changes |  5 +++++
 apache-commons-beanutils.spec    | 16 +++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/apache-commons-beanutils.changes b/apache-commons-beanutils.changes
index 461bd67..dc1f2e6 100644
--- a/apache-commons-beanutils.changes
+++ b/apache-commons-beanutils.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Oct 23 17:30:33 UTC 2018 - Fridrich Strba <fstrba@suse.com>
+
+- Cleanup the maven pom files installation
+
 -------------------------------------------------------------------
 Fri Sep 21 07:44:23 UTC 2018 - Tomáš Chvátal <tchvatal@suse.com>
 
diff --git a/apache-commons-beanutils.spec b/apache-commons-beanutils.spec
index 213c11e..848f65d 100644
--- a/apache-commons-beanutils.spec
+++ b/apache-commons-beanutils.spec
@@ -32,6 +32,8 @@ BuildRequires:  ant
 BuildRequires:  commons-collections
 BuildRequires:  commons-logging
 BuildRequires:  fdupes
+BuildRequires:  javapackages-local
+BuildRequires:  javapackages-tools
 BuildRequires:  xml-commons-apis
 Requires:       commons-collections >= 2.0
 Requires:       commons-logging >= 1.0
@@ -74,16 +76,19 @@ ant -Dbuild.sysclasspath=first dist
 %install
 # jars
 install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}.jar
+install -m 644 dist/%{short_name}-%{version}-SNAPSHOT.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
 
 pushd %{buildroot}%{_javadir}
+ln -s %{name}-%{version}.jar %{name}.jar
 for jar in *.jar; do
     ln -sf ${jar} `echo $jar| sed "s|apache-||g"`
 done
 popd # come back from javadir
 
+# poms
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}-%{version}.pom
+%add_maven_depmap %{name}-%{version}.pom %{name}-%{version}.jar -a "org.apache.commons:%{short_name}"
 
 # javadoc
 install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
@@ -95,7 +100,12 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name}
 %license LICENSE.txt
 %doc NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
-%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavenpomdir}/*
+%if %{defined _maven_repository}
+%{_mavendepmapfragdir}/%{name}
+%else
+%{_datadir}/maven-metadata/%{name}.xml*
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)