[mercury] switch to XMvn

[gil]

commit 5f1c33cceda70f364ff2a30870abd4470bfde05c
Author: gil <puntogil at libero.it>
Date:   Wed Jul 10 14:20:48 2013 +0200

    switch to XMvn

 mercury.spec |   46 ++++++++++++++++------------------------------
 1 files changed, 16 insertions(+), 30 deletions(-)
---
diff --git a/mercury.spec b/mercury.spec
index 3163deb..42d799e 100644
--- a/mercury.spec
+++ b/mercury.spec
@@ -2,10 +2,8 @@
 %global namedversion %{version}%{?namedreltag}
 Name:           mercury
 Version:        1.0
-Release:        0.12.alpha6%{?dist}
+Release:        0.13.alpha6%{?dist}
 Summary:        Replacement for the Maven Artifact subsystem
-
-Group:          Development/Tools
 License:        ASL 2.0
 URL:            http://maven.apache.org/mercury/mercury-artifact/
 # svn export http://svn.apache.org/repos/asf/maven/mercury/tags/mercury-1.0-alpha-6
@@ -20,19 +18,12 @@ BuildRequires:  apache-commons-collections
 BuildRequires:  apache-commons-lang
 BuildRequires:  apache-commons-logging
 BuildRequires:  java-devel >= 1:1.6.0
-BuildRequires:  jpackage-utils
 BuildRequires:  junit
 BuildRequires:  log4j
 BuildRequires:  maven-local
 BuildRequires:  maven2-common-poms
-BuildRequires:  maven-compiler-plugin
-BuildRequires:  maven-install-plugin
-BuildRequires:  maven-jar-plugin
-BuildRequires:  maven-javadoc-plugin
-BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-site-plugin
 BuildRequires:  maven-archiver
-BuildRequires:  maven-surefire
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  maven-wagon
 BuildRequires:  plexus-archiver
@@ -44,7 +35,6 @@ BuildRequires:  plexus-velocity
 BuildRequires:  tomcat-servlet-3.0-api
 BuildRequires:  velocity
 
-Requires:       jpackage-utils
 BuildArch:      noarch
 
 %description
@@ -59,8 +49,6 @@ and Plexus Component are not provided.
 
 %package javadoc
 Summary:        API documentation for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc HTML documentation for %{name}.
@@ -74,30 +62,28 @@ Javadoc HTML documentation for %{name}.
 find -name '*.java' -exec grep -l org.codehaus.plexus.lang '{}' \; |
         xargs perl -ni mercury-lang-i18n.pl
 
-mvn-rpmbuild install javadoc:aggregate \
-  -Dmaven.test.skip=true \
-
-%install
+%mvn_file :%{name}-artifact %{name}/artifact
+%mvn_file :%{name}-event %{name}/event
+%mvn_file :%{name}-external %{name}/external
+%mvn_file :%{name}-logging %{name}/logging
 
-mkdir -p %{buildroot}%{_javadir}/%{name}
-for S in logging artifact external event ; do
-# Code
- install -p -m644 %{name}-$S/target/%{name}-$S-%{namedversion}.jar \
-   %{buildroot}%{_javadir}/%{name}/$S.jar
-done
+%mvn_build -f
 
-# Javadoc
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -a target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
 
-%files
-%{_javadir}/%{name}
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc release.notes.txt ./src/licenses/apache.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
+%doc ./src/licenses/apache.txt
 
 %changelog
+* Wed Jul 10 2013 gil cattaneo <puntogil at libero.it> 1.0-0.13.alpha6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Wed Apr 10 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.0-0.12.alpha6
 - Drop dependency on plexus-container-default
 - Resolves: rhbz#950595