From e27bf29b3312d756c1c7c5fe7263401a94c8e42d Mon Sep 17 00:00:00 2001
From: spike <spike@fedoraproject.org>
Date: Tue, 9 Nov 2021 00:47:16 +0100
Subject: [PATCH] Cleanup spec file Enable tests

---
 apache-commons-pool.spec | 44 ++++++++++++++++++----------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index b89ed23..61799f8 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -1,17 +1,15 @@
-%global base_name       pool
-%global short_name      commons-%{base_name}
+Name:           apache-commons-pool
+Version:        1.6
+Release:        27%{?dist}
+Summary:        Apache Commons Pool Package
+License:        ASL 2.0
+URL:            http://commons.apache.org/pool/
+BuildArch:      noarch
 
-Name:             apache-%{short_name}
-Version:          1.6
-Release:          26%{?dist}
-Summary:          Apache Commons Pool Package
-License:          ASL 2.0
-URL:              http://commons.apache.org/%{base_name}/
-BuildArch:        noarch
-
-Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
+Source0:        http://www.apache.org/dist/commons/pool/source/commons-pool-%{version}-src.tar.gz
 
 BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
 BuildRequires:  mvn(org.apache.commons:commons-parent:pom:)
 
 %description
@@ -20,32 +18,30 @@ pooling package to be distributed under the ASF license. The package should
 support a variety of pool implementations, but encourage support of an
 interface that makes these implementations interchangeable.
 
-%package javadoc
-Summary:          Javadoc for %{name}
-
-%description javadoc
-This package contains the API documentation for %{name}.
+%{?javadoc_package}
 
 %prep
-%setup -q -n %{short_name}-%{version}-src
+%autosetup -p1 -n commons-pool-%{version}-src
 
-%mvn_alias : org.apache.commons:%{short_name}
-%mvn_file : %{short_name} %{name}
+# Compatibility links
+%mvn_alias : org.apache.commons:commons-pool
+%mvn_file : commons-pool %{name}
 
 %build
-%mvn_build -f -- -Dcommons.osgi.symbolicName=org.apache.commons.pool -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
+%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
 
 %install
 %mvn_install
 
 %files -f .mfiles
+%license LICENSE.txt NOTICE.txt
 %doc README.txt RELEASE-NOTES.txt
-%license LICENSE.txt NOTICE.txt
-
-%files javadoc -f .mfiles-javadoc
-%license LICENSE.txt NOTICE.txt
 
 %changelog
+* Mon Nov 8 2021 Christian Schuermann <spike@fedoraproject.org> 1.6-27
+- Cleanup spec file
+- Enable tests
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.6-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild