From 996df4f9f58d2414715a5d9f8919740cb86e4b87 Mon Sep 17 00:00:00 2001
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
Date: Aug 08 2013 14:05:35 +0000
Subject: Update to latest packaging guidelines


---

diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index 454859e..453747d 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -3,9 +3,8 @@
 
 Name:             apache-%{short_name}
 Version:          1.6
-Release:          6%{?dist}
+Release:          7%{?dist}
 Summary:          Apache Commons Pool Package
-Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://commons.apache.org/%{base_name}/
 Source0:          http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
@@ -14,10 +13,6 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
-BuildRequires:    maven-surefire-provider-junit4
-
-Requires:         java >= 1:1.6.0
-Requires:         jpackage-utils
 
 # This should go away with F-17
 Provides:         jakarta-%{short_name} = 0:%{version}-%{release}
@@ -26,17 +21,13 @@ Obsoletes:        jakarta-%{short_name}-tomcat5 < 0:1.3-14
 Obsoletes:        jakarta-%{short_name}-manual < 0:1.3-14
 
 %description
-The goal of Pool package is it to create and maintain an object (instance) 
-pooling package to be distributed under the ASF license. The package should 
-support a variety of pool implementations, but encourage support of an 
+The goal of Pool package is it to create and maintain an object (instance)
+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}
-Group:            Documentation
-Requires:         jpackage-utils
-# This should go away with F-17
-Obsoletes:        jakarta-%{short_name}-javadoc < 0:1.3-14
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -44,35 +35,25 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{short_name}-%{version}-src
 
+%mvn_alias : org.apache.commons:%{short_name}
+%mvn_file : %{name} %{short_name}
+
 %build
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install javadoc:javadoc
+%mvn_build -f
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-(cd %{buildroot}%{_javadir} && for jar in *%{name}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
+%mvn_install
 
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "org.apache.commons:%{short_name}"
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
-
-%files
+%files -f .mfiles
 %doc README.txt LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Thu Aug  8 2013 Stanislav Ochotnicky <sochotnicky@redhat.com> - 1.6-7
+- Update to latest packaging guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild