[apache-commons-configuration] Update to current guidelines.

[Alexander Kurtakov]

commit cef07ae90144fcd14d0803dc1437a2112d29974e
Author: Alexander Kurtakov <akurtako at redhat.com>
Date:   Wed Apr 18 01:36:58 2012 +0300

    Update to current guidelines.
    
    - Move to servlet 3.

 0002-Remove-test-deps.patch             |   64 -------------------------------
 apache-commons-configuration-depmap.xml |   26 ------------
 apache-commons-configuration.spec       |   55 ++++++++++-----------------
 3 files changed, 20 insertions(+), 125 deletions(-)
---
diff --git a/apache-commons-configuration.spec b/apache-commons-configuration.spec
index 6888505..f838818 100644
--- a/apache-commons-configuration.spec
+++ b/apache-commons-configuration.spec
@@ -4,7 +4,7 @@
 
 Name:           apache-%{short_name}
 Version:        1.6
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Commons Configuration Package
 
 Group:          Development/Libraries
@@ -12,23 +12,22 @@ 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
 Patch0:         0001-Change-ant-groupId-to-org.apache.ant.patch
-Patch1:         0002-Remove-test-deps.patch
 BuildArch:      noarch
 
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils >= 0:1.7.2
 BuildRequires:  maven-doxia-sitetools
 BuildRequires:  maven-plugin-bundle
-BuildRequires:  maven-surefire-maven-plugin
+BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-surefire-provider-junit
-BuildRequires:  maven2-plugin-antrun
-BuildRequires:  maven2-plugin-assembly
-BuildRequires:  maven2-plugin-compiler
-BuildRequires:  maven2-plugin-idea
-BuildRequires:  maven2-plugin-install
-BuildRequires:  maven2-plugin-jar
-BuildRequires:  maven2-plugin-javadoc
-BuildRequires:  maven2-plugin-resources
+BuildRequires:  maven-antrun-plugin
+BuildRequires:  maven-assembly-plugin
+BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-idea-plugin
+BuildRequires:  maven-install-plugin
+BuildRequires:  maven-jar-plugin
+BuildRequires:  maven-javadoc-plugin
+BuildRequires:  maven-resources-plugin
 BuildRequires:  maven
 
 BuildRequires:  xalan-j2
@@ -38,33 +37,29 @@ BuildRequires:  apache-commons-beanutils >= 0:1.7.0
 BuildRequires:  apache-commons-codec
 BuildRequires:  apache-commons-lang
 BuildRequires:  apache-commons-logging
-# convert to apache-commons when transition is done
 BuildRequires:  apache-commons-collections
-BuildRequires:  jakarta-commons-dbcp
+BuildRequires:  apache-commons-dbcp
 BuildRequires:  apache-commons-digester
 BuildRequires:  apache-commons-jxpath
-BuildRequires:  jakarta-commons-pool
-BuildRequires:  servlet25
-BuildRequires:  tomcat6
+BuildRequires:  apache-commons-pool
+BuildRequires:  tomcat-servlet-3.0-api
 
-Requires:  servlet25
+Requires:  tomcat-servlet-3.0-api
 Requires:  apache-commons-beanutils >= 0:1.7.0
 Requires:  apache-commons-codec
 Requires:  apache-commons-jxpath
 Requires:  apache-commons-lang
 Requires:  apache-commons-logging
 Requires:  apache-commons-collections
-Requires:  jakarta-commons-dbcp
+Requires:  apache-commons-dbcp
 Requires:  apache-commons-digester
-Requires:  jakarta-commons-pool
+Requires:  apache-commons-pool
 Requires:  xerces-j2
 Requires:  xml-commons-apis
 
 Requires(post):   jpackage-utils >= 1.7.2
 Requires(postun): jpackage-utils >= 1.7.2
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
 Provides:       jakarta-%{short_name} = 0:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} < 0:%{version}-%{release}
 
@@ -96,7 +91,6 @@ Obsoletes:      jakarta-%{short_name}-javadoc < 0:%{version}-%{release}
 %prep
 %setup -q -n %{short_name}-%{version}-src
 %patch0 -p1
-%patch1 -p1
 %{__sed} -i 's/\r//' LICENSE.txt
 
 %build
@@ -124,31 +118,22 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{short_name}.pom
 # should use proper groupid org.apache.commons and also artifactid
 %add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
 
-%pre javadoc
-# workaround for rpm bug, can be removed in F-17
-[ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
-rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
 %files
-%defattr(-,root,root,-)
 %{_mavendepmapfragdir}/*
 %{_mavenpomdir}/JPP-%{short_name}.pom
 %doc LICENSE.txt
 %{_javadir}/*.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
 %doc %{_javadocdir}/%{name}
 
 
 %changelog
+* Wed Apr 18 2012 Alexander Kurtakov <akurtako at redhat.com> 1.6-7
+- Update to current guidelines.
+- Move to servlet 3.
+
 * Thu Jan 12 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.6-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild