From b412056e92fd8a54ba9f19956647a52384dbc47d7b1940350281401f229f490a Mon Sep 17 00:00:00 2001
From: Fridrich Strba <fstrba@suse.com>
Date: Mon, 4 Feb 2019 06:21:45 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/Java:packages/apache-commons-lang3?expand=0&rev=16

---
 apache-commons-lang3.changes |  5 +++++
 apache-commons-lang3.spec    | 32 +++++++++++---------------------
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/apache-commons-lang3.changes b/apache-commons-lang3.changes
index 6b86b54..b1ba88a 100644
--- a/apache-commons-lang3.changes
+++ b/apache-commons-lang3.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Feb  4 06:21:14 UTC 2019 - Fridrich Strba <fstrba@suse.com>
+
+- Clean-up the spec file and install less jar symlinks
+
 -------------------------------------------------------------------
 Mon Oct 22 10:24:43 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 
diff --git a/apache-commons-lang3.spec b/apache-commons-lang3.spec
index dabe3b4..29cc943 100644
--- a/apache-commons-lang3.spec
+++ b/apache-commons-lang3.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package apache-commons-lang3
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,11 +30,12 @@ Source1:        build.xml
 Source2:        default.properties
 BuildRequires:  ant
 BuildRequires:  ant-junit
+BuildRequires:  apache-commons-parent
 BuildRequires:  fdupes
 BuildRequires:  java-devel >= 1.7
 BuildRequires:  javapackages-local
-BuildRequires:  javapackages-tools
 BuildRequires:  junit
+Requires:       apache-commons-parent
 Provides:       %{short_name} = %{version}-%{release}
 BuildArch:      noarch
 
@@ -76,33 +77,22 @@ ant \
 
 # jars
 install -dm 755 %{buildroot}%{_javadir}
-install -m 0644  target/%{short_name}.jar %{buildroot}%{_javadir}/%{short_name}-%{version}.jar
-pushd %{buildroot}%{_javadir}
-  ln -s %{short_name}-%{version}.jar %{short_name}.jar
-  ln -s %{short_name}-%{version}.jar %{name}-%{version}.jar
-  ln -s %{name}-%{version}.jar %{name}.jar
-popd
-
+install -m 0644  target/%{short_name}.jar %{buildroot}%{_javadir}/%{name}.jar
+ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
 # pom
 install -dm 755 %{buildroot}%{_mavenpomdir}
-install -m 0644  pom.xml %{buildroot}%{_mavenpomdir}/%{short_name}-%{version}.pom
-%add_maven_depmap %{short_name}-%{version}.pom %{short_name}-%{version}.jar
+install -m 0644  pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
+%add_maven_depmap %{name}.pom %{name}.jar
 
 # javadoc
 install -dm 755 %{buildroot}%{_javadocdir}/%{name}
 cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %fdupes -s %{buildroot}%{_javadocdir}/%{name}/
 
-%files
-%license LICENSE.txt
-%doc NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*.jar
-%{_mavenpomdir}/*
-%if %{defined _maven_repository}
-%{_mavendepmapfragdir}/%{name}
-%else
-%{_datadir}/maven-metadata/%{name}.xml*
-%endif
+%files -f .mfiles
+%license LICENSE.txt NOTICE.txt
+%doc RELEASE-NOTES.txt
+%{_javadir}/%{short_name}.jar
 
 %files javadoc
 %{_javadocdir}/%{name}