[geronimo-jta] Build with xmvn

[Michal Srb]

commit d8fc2ba7a97b8fd272b7fa650ed9f1b8e96c695c
Author: Michal Srb <msrb at redhat.com>
Date:   Thu Jan 17 10:30:15 2013 +0100

    Build with xmvn

 geronimo-jta.spec |   43 +++++++++++--------------------------------
 1 files changed, 11 insertions(+), 32 deletions(-)
---
diff --git a/geronimo-jta.spec b/geronimo-jta.spec
index 266eab8..3641b7d 100644
--- a/geronimo-jta.spec
+++ b/geronimo-jta.spec
@@ -2,7 +2,7 @@
 
 Name:		geronimo-jta
 Version:	1.1.1
-Release:	10%{?dist}
+Release:	11%{?dist}
 Summary:	J2EE JTA v1.1 API
 
 Group:		Development/Libraries
@@ -14,6 +14,7 @@ Source0:	%{spec_name}-%{version}.tar.bz
 BuildArch:	noarch
 
 # This pulls in almost all of the required java and maven stuff
+BuildRequires:  xmvn
 BuildRequires:	geronimo-parent-poms
 BuildRequires:	maven-resources-plugin
 
@@ -31,7 +32,6 @@ applications.
 %package javadoc
 Summary:	API documentation for %{name}
 Group:		Documentation
-Requires:	jpackage-utils >= 0:1.7.5
 BuildArch:	noarch
 
 %description javadoc
@@ -42,50 +42,29 @@ BuildArch:	noarch
 
 
 %build
-mvn-rpmbuild -Dmaven.test.skip=true \
-	         install javadoc:javadoc
-
+%mvn_file  : %{name} %{spec_name} jta
+%mvn_alias : javax.transaction:jta
+%mvn_build -f
 
 %install
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-
-install -m 644 target/%{spec_name}-%{version}.jar \
-  $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# Also provide compat symlinks
-pushd $RPM_BUILD_ROOT%{_javadir}
-ln -sf %{name}.jar %{spec_name}.jar
-ln -sf %{name}.jar jta.jar
-popd
-
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT/%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar -a "javax.transaction:jta"
+%mvn_install
 
 %pre javadoc
 # workaround for rpm bug, can be removed in F-20
 [ $1 -gt 1 ] && [ -L %{_javadocdir}/%{name} ] && \
 rm -rf $(readlink -f %{_javadocdir}/%{name}) %{_javadocdir}/%{name} || :
 
-%files
+%files -f .mfiles
 %doc LICENSE.txt NOTICE.txt
-%{_javadir}/%{name}.jar
-%{_javadir}/%{spec_name}.jar
-%{_javadir}/jta.jar
-%{_mavendepmapfragdir}/%{name}
-%{_mavenpomdir}/JPP-%{name}.pom
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt NOTICE.txt
-%{_javadocdir}/%{name}
 
 
 %changelog
+* Thu Jan 17 2013 Michal Srb <msrb at redhat.com> - 1.1.1-11
+- Build with xmvn
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1.1-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild