[cdi-api1] Switch to xmvn

[Marek Goldmann]

commit f1943c6081f568aefdaca6591793643078ac5daf
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Jul 7 14:31:07 2014 +0200

    Switch to xmvn

 cdi-api1.spec |   39 +++++++++------------------------------
 1 files changed, 9 insertions(+), 30 deletions(-)
---
diff --git a/cdi-api1.spec b/cdi-api1.spec
index 73d4a70..6ad5308 100644
--- a/cdi-api1.spec
+++ b/cdi-api1.spec
@@ -5,7 +5,7 @@
 
 Name:             cdi-api1
 Version:          1.0
-Release:          13%{namedreltag}%{?dist}
+Release:          14%{namedreltag}%{?dist}
 Summary:          CDI API 1.0
 Group:            Development/Libraries
 License:          ASL 2.0
@@ -35,13 +35,6 @@ BuildRequires:    geronimo-parent-poms
 BuildRequires:    weld-parent
 BuildRequires:    jpackage-utils
 
-Requires:         jpackage-utils
-Requires:         java-headless
-Requires:         jboss-el-2.2-api
-Requires:         jboss-interceptors-1.1-api
-Requires:         jboss-ejb-3.1-api
-Requires:         geronimo-annotation
-
 %description
 APIs for JSR-299: Contexts and Dependency Injection for Java EE
 
@@ -51,7 +44,6 @@ Summary:          Javadocs for %{name}
 %description javadoc
 This package contains the API documentation for %{name}.
 Group:            Documentation
-Requires:         jpackage-utils
 
 %prep
 %setup -q -n cdi-api-%{namedversion}
@@ -59,35 +51,22 @@ Requires:         jpackage-utils
 cp %{SOURCE1} .
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-
-# JAR
-install -pm 644 target/cdi-api-%{upstreamversion}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar
-
-# POM
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
+%mvn_install
 
-%add_maven_depmap JPP.%{name}-%{name}.pom %{name}/%{name}.jar -v "1,%{upstreamversion}"
-
-# JAVADOC
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE-2.0.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt
 
 %changelog
+* Mon Jul 07 2014 Marek Goldmann <mgoldman at redhat.com> - 1.0-14.SP4
+- Switch to xmvn
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0-13.SP4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild