[jboss-naming] Use mvn_build (fixes 992603)

[Peter Robinson]

commit 9093a0c696625c39496e55f7d666450f8683c8f7
Author: Peter Robinson <pbrobinson at gmail.com>
Date:   Wed Jul 9 00:03:12 2014 +0100

    Use mvn_build (fixes 992603)

 jboss-naming.spec |   47 +++++++++++------------------------------------
 1 files changed, 11 insertions(+), 36 deletions(-)
---
diff --git a/jboss-naming.spec b/jboss-naming.spec
index 092ff0d..2576c77 100644
--- a/jboss-naming.spec
+++ b/jboss-naming.spec
@@ -3,9 +3,8 @@
 
 Name:             jboss-naming
 Version:          5.0.6
-Release:          0.9%{namedreltag}%{?dist}
+Release:          0.10%{namedreltag}%{?dist}
 Summary:          JBoss Naming
-Group:            Development/Libraries
 License:          LGPLv2+
 URL:              http://www.jboss.org
 
@@ -27,17 +26,11 @@ BuildRequires:    maven-antrun-plugin
 BuildRequires:    maven-enforcer-plugin
 BuildRequires:    rmic-maven-plugin
 
-Requires:         jboss-common-core
-Requires:         jboss-logging
-Requires:         jpackage-utils
-
 %description
 The JBoss JNDI name server implementation
 
 %package javadoc
 Summary:          Javadocs for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -46,43 +39,25 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{name}-%{namedversion}
 %patch0 -p1
 
+%mvn_file ':jnp-{client,server}' %{name}- at 1
+
 %build
 # No jboss-test and jboss-kernel packages
-mvn-rpmbuild -Dmaven.test.skip=true install javadoc:aggregate
+%mvn_build -f
 
 %install
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 jnpclient/target/jnp-client-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-client.jar
-install -pm 644 jnpserver/target/jnpserver-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-server.jar
-
-# POM
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-build.pom
-install -pm 644 jnpclient/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-client.pom
-install -pm 644 jnpserver/pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}-server.pom
-
-# DEPMAP
-%add_maven_depmap JPP-%{name}-build.pom
-%add_maven_depmap JPP-%{name}-client.pom %{name}-client.jar
-%add_maven_depmap JPP-%{name}-server.pom %{name}-server.jar
-
-# APIDOCS
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%mvn_install
+
+%files -f .mfiles
 %doc JBossORG-EULA.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc JBossORG-EULA.txt
 
 %changelog
+* Tue Jul 08 2014 Michael Simacek <msimacek at redhat.com> - 5.0.6-0.10.CR1
+- Use mvn_build (fixes 992603)
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.0.6-0.9.CR1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild