[java-sig-commits] [apache-commons-pool] Adapt to current guidelines.

[Alexander Kurtakov]

commit 0a852ed9c46569a0129045f21a71a14f948456b9
Author: Alexander Kurtakov < <akurtako at redhat.com>
Date:   Wed Nov 30 14:29:46 2011 +0200

    Adapt to current guidelines.

 apache-commons-pool.spec |   38 ++++++++++----------------------------
 sources                  |    1 -
 2 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec
index 5e990e2..5aec0dc 100644
--- a/apache-commons-pool.spec
+++ b/apache-commons-pool.spec
@@ -3,13 +3,12 @@
 
 Name:             apache-%{short_name}
 Version:          1.5.6
-Release:          1%{?dist}
+Release:          2%{?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
-BuildRoot:        %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -50,51 +49,34 @@ This package contains the API documentation for %{name}.
 mvn-rpmbuild install javadoc:javadoc
 
 %install
-rm -rf %{buildroot}
-
 # jars
 install -d -m 0755 %{buildroot}%{_javadir}
-install -pm 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|apache-||g"`; done)
-(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+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)
 
 # pom
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_to_maven_depmap org.apache.commons %{short_name} %{version} JPP %{short_name}
-
-# following line is only for backwards compatibility. New packages
-# should use proper groupid org.apache.commons and also artifactid
-%add_to_maven_depmap %{short_name} %{short_name} %{version} JPP %{short_name}
+install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
+%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name}"
 
 # javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}-%{version}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}-%{version}/
-ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
-
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
-
-%clean
-rm -rf %{buildroot}
+install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
+cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 
 %files
-%defattr(-,root,root,-)
 %doc README.txt LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
 %{_javadir}/*
 %{_mavenpomdir}/*
 %{_mavendepmapfragdir}/*
 
 %files javadoc
-%defattr(-,root,root,-)
 %doc LICENSE.txt
-%{_javadocdir}/%{name}-%{version}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Nov 30 2011 Alexander Kurtakov <akurtako at redhat.com> 1.5.6-2
+- Adapt to current guidelines.
+
 * Fri Apr 15 2011 Chris Spike <spike at fedoraproject.org> 1.5.6-1
 - Updated to 1.5.6
 - Fixed build for maven 3
diff --git a/sources b/sources
index 7557ee2..cb5b3fd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-1a71f00c8ab265efae3724295636f2e0  commons-pool-1.5.5-src.tar.gz
 e024ffad4a52ebd5986c74851f688c0d  commons-pool-1.5.6-src.tar.gz