[aries-blueprint] Switch to xmvn

[Marek Goldmann]

commit ae69409f3f8d7824c50333c872748c31f08494ec
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Tue Jul 8 12:26:46 2014 +0200

    Switch to xmvn

 aries-blueprint.spec |   61 +++++++++----------------------------------------
 1 files changed, 12 insertions(+), 49 deletions(-)
---
diff --git a/aries-blueprint.spec b/aries-blueprint.spec
index 8f42526..d3f6e31 100644
--- a/aries-blueprint.spec
+++ b/aries-blueprint.spec
@@ -1,6 +1,6 @@
 Name:          aries-blueprint
 Version:       0.3.1
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       Apache Aries Blueprint
 License:       ASL 2.0
 Group:         Development/Libraries
@@ -30,20 +30,10 @@ BuildRequires: maven-surefire-plugin
 BuildRequires: aries-util
 BuildRequires: aries-proxy
 BuildRequires: aries-quiesce
-BuildRequires: objectweb-asm
 BuildRequires: felix-osgi-compendium
 BuildRequires: felix-osgi-core
 BuildRequires: xbean
-
-Requires:      java-headless
-Requires:      jpackage-utils
-Requires:      aries-util
-Requires:      aries-proxy
-Requires:      aries-quiesce
-Requires:      objectweb-asm
-Requires:      felix-osgi-compendium
-Requires:      felix-osgi-core
-Requires:      xbean
+BuildRequires: objectweb-asm3
 
 %description
 Implementation of the Blueprint Container Specification.
@@ -51,7 +41,6 @@ Implementation of the Blueprint Container Specification.
 %package javadoc
 Summary:       Javadocs for %{name}
 Group:         Documentation
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -61,53 +50,27 @@ This package contains the API documentation for %{name}.
 %patch0 -p1
 %patch1 -p1
 
+
+
 %build
 # tests disabled because of
 # missing dependency on org.apache.aries.unittest
-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 blueprint-annotation-api blueprint-api blueprint-cm \
-              blueprint-core blueprint-sample;
-do
-  pushd $module
-  jarname=`echo org.apache.aries.$module | tr - .`
-  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
-
-# javadoc
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-
-%files
+%files -f .mfiles
 %doc README LICENSE NOTICE
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%dir %{_javadir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{name}
 
 %changelog
+* Tue Jul 08 2014 Marek Goldmann <mgoldman at redhat.com> - 1:0.3.1-10
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1:0.3.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild