[geronimo-jms] Build with xmvn

[Michal Srb]

commit 947fb99291afa8a912dafb44bc7b35bdcf6fcc47
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Jan 21 15:53:08 2013 +0100

    Build with xmvn

 geronimo-jms.spec |   39 +++++++++++----------------------------
 1 files changed, 11 insertions(+), 28 deletions(-)
---
diff --git a/geronimo-jms.spec b/geronimo-jms.spec
index f25d5d2..ebbc4e9 100644
--- a/geronimo-jms.spec
+++ b/geronimo-jms.spec
@@ -2,7 +2,7 @@
 
 Name:		geronimo-jms
 Version:	1.1.1
-Release:	13%{?dist}
+Release:	14%{?dist}
 Summary:	J2EE JMS v1.1 API
 
 Group:		Development/Libraries
@@ -17,6 +17,7 @@ BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:	noarch
 
 # This pulls in almost all of the required java and maven stuff
+BuildRequires:  xmvn
 BuildRequires:	geronimo-parent-poms
 BuildRequires:	maven-resources-plugin
 
@@ -46,49 +47,31 @@ BuildArch:	noarch
 
 
 %build
-mvn-rpmbuild \
-	-Dmaven.test.skip=true \
-	install javadoc:javadoc
+%mvn_file  : %{name} %{spec_name} jms
+%mvn_alias : javax.jms:jms
+%mvn_build -f
 
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
+%mvn_install
 
-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 jms.jar
-popd
-
-install -d -m 755 $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.jms:jms"
 
 %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}/jms.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-14
+- Build with xmvn
+
 * Thu Aug 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.1.1-13
 - Install LICENSE and NOTICE with javadoc package