[jboss-sasl] Switch to xmvn

[Marek Goldmann]

commit f4e8d8bc6c72eccdf7d71a09486e1c964b729615
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 1 15:47:13 2014 +0200

    Switch to xmvn

 jboss-sasl.spec |   39 ++++++++++-----------------------------
 1 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/jboss-sasl.spec b/jboss-sasl.spec
index 0d0ad1d..8447ab7 100644
--- a/jboss-sasl.spec
+++ b/jboss-sasl.spec
@@ -3,7 +3,7 @@
 
 Name:             jboss-sasl
 Version:          1.0.0
-Release:          9%{?dist}
+Release:          10%{?dist}
 Summary:          SASL Provider for J2SE
 Group:            Development/Libraries
 License:          LGPLv2+
@@ -15,7 +15,6 @@ Source0:          %{name}-%{namedversion}.tar.xz
 
 BuildArch:        noarch
 
-BuildRequires:    jpackage-utils
 BuildRequires:    java-devel
 BuildRequires:    maven-local
 BuildRequires:    maven-compiler-plugin
@@ -24,7 +23,7 @@ BuildRequires:    maven-jar-plugin
 BuildRequires:    maven-javadoc-plugin
 BuildRequires:    maven-release-plugin
 BuildRequires:    maven-resources-plugin
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    maven-injection-plugin
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    maven-checkstyle-plugin
@@ -36,17 +35,12 @@ BuildRequires:    jboss-parent
 BuildRequires:    jboss-logging
 BuildRequires:    jboss-logging-tools
 
-Requires:         jboss-logging
-Requires:         jboss-logging-tools
-Requires:         jpackage-utils
-
 %description
 This package contains SASL Provider for J2SE
 
 %package javadoc
 Summary:          Javadocs for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -55,33 +49,20 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{namedversion}
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-# JAR
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-# APIDOCS
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# POM
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-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}
 
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jul 01 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0.0-10
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild