[jaxws-jboss-httpserver-httpspi] Switch to xmvn

[Marek Goldmann]

commit 178dc97a4c16d3a03c1368f685f51d639ea1a9d3
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Jul 7 10:18:13 2014 +0200

    Switch to xmvn

 jaxws-jboss-httpserver-httpspi.spec |   41 ++++++++--------------------------
 1 files changed, 10 insertions(+), 31 deletions(-)
---
diff --git a/jaxws-jboss-httpserver-httpspi.spec b/jaxws-jboss-httpserver-httpspi.spec
index 9a62099..6ce6d00 100644
--- a/jaxws-jboss-httpserver-httpspi.spec
+++ b/jaxws-jboss-httpserver-httpspi.spec
@@ -3,7 +3,7 @@
 
 Name:             jaxws-jboss-httpserver-httpspi
 Version:          1.0.1
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          JBoss httpserver to JAXWS 2.2 HTTP SPI bridge
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -22,7 +22,7 @@ BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-install-plugin
 BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-dependency-plugin
 BuildRequires:    cxf-rt
 BuildRequires:    jboss-servlet-3.0-api
@@ -30,19 +30,12 @@ BuildRequires:    jboss-jaxws-2.2-api
 BuildRequires:    jboss-httpserver
 BuildRequires:    junit
 
-Requires:         jpackage-utils
-Requires:         cxf-rt
-Requires:         jboss-servlet-3.0-api
-Requires:         jboss-jaxws-2.2-api
-Requires:         jboss-httpserver
-
 %description
 This package contains the JBoss httpserver to JAXWS 2.2 HTTP SPI bridge.
 
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -55,34 +48,20 @@ This package contains the API documentation for %{name}.
 
 %build
 # Some Apache CXF modules are still not avialable
-mvn-rpmbuild -Dmaven.test.skip=true package javadoc:aggregate
+%mvn_build -f
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
+%mvn_install
 
-# DEPMAP
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Jul 07 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.1-8
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild