[apache-commons-dbutils] Update for newer guidelines

[mbooth]

commit 479b6c5dfed3c54a1fb24a6849962e91c6327cdf
Author: Mat Booth <fedora at matbooth.co.uk>
Date:   Tue Aug 6 08:16:09 2013 +0100

    Update for newer guidelines

 apache-commons-dbutils.spec |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)
---
diff --git a/apache-commons-dbutils.spec b/apache-commons-dbutils.spec
index d6c927d..9ea0387 100644
--- a/apache-commons-dbutils.spec
+++ b/apache-commons-dbutils.spec
@@ -1,14 +1,13 @@
-%global base_name       dbutils
-%global short_name      commons-%{base_name}
+%global short_name      commons-dbutils
 
 Name:             apache-%{short_name}
 Version:          1.5
-Release:          4%{?dist}
+Release:          5%{?dist}
 Summary:          Apache Commons DbUtils 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
+URL:              http://commons.apache.org/dbutils/
+Source0:          http://www.apache.org/dist/commons/dbutils/source/%{short_name}-%{version}-src.tar.gz
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
@@ -34,39 +33,30 @@ Requires:         jpackage-utils
 %description javadoc
 This package contains the API documentation for %{name}.
 
-
 %prep
 %setup -q -n %{short_name}-%{version}-src
 sed -i 's/\r//' *.txt
 
+# Compatibility links
+%mvn_alias "%{short_name}:%{short_name}" "org.apache.commons:%{short_name}"
+%mvn_file :commons-dbutils %{short_name} %{name}
+
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}
-install -m 644 target/%{short_name}-%{version}.jar   %{buildroot}%{_javadir}/%{name}.jar
-
-# poms
-install -d -m 0755 %{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}"
+%mvn_install
 
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
 
-%files javadoc
-%doc LICENSE.txt
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Tue Aug 06 2013 Mat Booth <fedora at matbooth.co.uk> - 1.5-5
+- Update for newer guidelines
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild