[apache-commons-discovery] Build with xmvn

[Michal Srb]

commit c89b0ddb10f0b9e4c3d2f864dd740df8e04ae256
Author: Michal Srb <msrb at redhat.com>
Date:   Tue Jan 15 15:05:41 2013 +0100

    Build with xmvn

 apache-commons-discovery.spec |   36 +++++++++++++-----------------------
 1 files changed, 13 insertions(+), 23 deletions(-)
---
diff --git a/apache-commons-discovery.spec b/apache-commons-discovery.spec
index f7bc32d..b10b716 100644
--- a/apache-commons-discovery.spec
+++ b/apache-commons-discovery.spec
@@ -3,7 +3,7 @@
 
 Name:           apache-%{short_name}
 Version:        0.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          2
 Summary:        Apache Commons Discovery
 License:        ASL 2.0
@@ -12,14 +12,13 @@ URL:            http://commons.apache.org/%{base_name}
 Source0:        http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz
 Patch0:         %{name}-addosgimanifest.patch
 BuildArch:      noarch
+
+BuildRequires:  xmvn >= 0.2.3
 BuildRequires:  java-devel >= 1:1.6.0
 BuildRequires:  jpackage-utils >= 0:1.6
-BuildRequires:  maven
 BuildRequires:  maven-surefire-provider-junit4
 BuildRequires:  apache-commons-logging >= 1.1.1
-Requires:       apache-commons-logging >= 1.1.1
 
-# This should go away with F-17
 Provides:       jakarta-%{short_name} = %{epoch}:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name} <= 1:0.4
 
@@ -36,6 +35,7 @@ Group:          Documentation
 Summary:        API documentation for %{name}
 Requires:       jpackage-utils
 
+Provides:       jakarta-%{short_name}-javadoc = %{epoch}:%{version}-%{release}
 Obsoletes:      jakarta-%{short_name}-javadoc <= 1:0.4
 
 %description javadoc
@@ -46,33 +46,23 @@ Obsoletes:      jakarta-%{short_name}-javadoc <= 1:0.4
 %patch0
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_file  : %{short_name} %{name}
+%mvn_build
 
 %install
-# jar
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-ln -sf %{name}.jar %{buildroot}%{_javadir}/%{short_name}.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{short_name}.pom
-%add_maven_depmap JPP-%{short_name}.pom %{short_name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
-%{_javadir}/*
-%{_mavenpomdir}/JPP-%{short_name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
 
+
 %changelog
+* Tue Jan 15 2013 Michal Srb <msrb at redhat.com> - 2:0.5-5
+- Build with xmvn
+
 * Wed Jul 18 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2:0.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild