[aries-proxy] Switch to xmvn

[Marek Goldmann]

commit 5db753ca86da2a3a18f4f255486a76ec6d3dafa6
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 8 12:39:20 2014 +0200

    Switch to xmvn

 aries-proxy.spec |   57 +++++++++--------------------------------------------
 1 files changed, 10 insertions(+), 47 deletions(-)
---
diff --git a/aries-proxy.spec b/aries-proxy.spec
index 7b4680e..2198b73 100644
--- a/aries-proxy.spec
+++ b/aries-proxy.spec
@@ -1,6 +1,6 @@
 Name:          aries-proxy
 Version:       0.3
-Release:       8%{?dist}
+Release:       9%{?dist}
 Summary:       Apache Aries Class Proxy
 License:       ASL 2.0
 Group:         Development/Libraries
@@ -17,7 +17,6 @@ BuildArch:     noarch
 Epoch:         1
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: maven-local
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-install-plugin
@@ -27,19 +26,11 @@ BuildRequires: maven-release-plugin
 BuildRequires: maven-resources-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: aries-util
-BuildRequires: objectweb-asm
+BuildRequires: objectweb-asm3
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: slf4j
 
-Requires:      java-headless
-Requires:      jpackage-utils
-Requires:      aries-util
-Requires:      objectweb-asm
-Requires:      felix-osgi-compendium
-Requires:      felix-osgi-core
-Requires:      slf4j
-
 %description
 A common proxy class generation service that can be used by
 blueprint and jndi and others.
@@ -47,7 +38,6 @@ blueprint and jndi and others.
 %package javadoc
 Summary:       Javadocs for %{name}
 Group:         Documentation
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -58,47 +48,20 @@ This package contains the API documentation for %{name}.
 
 %build
 # test failures in ProxySubclassGeneratorTest
-mvn-rpmbuild \
-  -Dmaven.test.skip=true \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  package javadoc:aggregate
+%mvn_build -f
 
 %install
+%mvn_install
 
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-# modules
-for module in api impl;
-do
-  pushd proxy-$module
-  jarname=org.apache.aries.proxy.$module
-  install -pm 644 target/$jarname-%{version}.jar %{buildroot}%{_javadir}/%{name}/$jarname.jar
-  install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-$jarname.pom
-  %add_maven_depmap JPP.%{name}-$jarname.pom %{name}/$jarname.jar
-  popd
-done
-
-# pom
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}.pom
-
-# depmap
-%add_maven_depmap JPP.%{name}.pom
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Jul 08 2014 Marek Goldmann <mgoldman at redhat.com> - 1:0.3-9
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.3-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild