[felix-configadmin] Using xmvn

[Marek Goldmann]

commit c6dbe72d854df5c9fc8b1322cd4ef771997ddcea
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Wed Aug 7 11:51:50 2013 +0200

    Using xmvn

 felix-configadmin.spec |   37 +++++++++----------------------------
 1 files changed, 9 insertions(+), 28 deletions(-)
---
diff --git a/felix-configadmin.spec b/felix-configadmin.spec
index 563c2d5..136ec43 100644
--- a/felix-configadmin.spec
+++ b/felix-configadmin.spec
@@ -3,7 +3,7 @@
 
 Name:             felix-configadmin
 Version:          1.4.0
-Release:          8%{?dist}
+Release:          9%{?dist}
 Summary:          Felix Configuration Admin Service
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -13,8 +13,6 @@ Source0:          http://www.fightrice.com/mirrors/apache/felix/%{site_name}-%{v
 
 BuildArch:        noarch
 
-BuildRequires:    java-devel
-BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
 BuildRequires:    maven-surefire-provider-junit4
 BuildRequires:    felix-osgi-compendium >= 1.4.0-10
@@ -23,19 +21,12 @@ BuildRequires:    aqute-bndlib
 BuildRequires:    animal-sniffer
 BuildRequires:    maven-shared
 
-Requires:         java
-Requires:         jpackage-utils
-Requires:         felix-osgi-compendium >= 1.4.0-10
-Requires:         felix-osgi-core
-Requires:         aqute-bndlib
-
 %description
 Implementation of the OSGi Configuration Admin Service Specification 1.4.
 
 %package javadoc
 Summary:          API documentation for %{name}
 Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -45,32 +36,22 @@ This package contains the API documentation for %{name}.
 
 %build
 # Pax test dependency unavailable
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 -Dmaven.test.skip=true package javadoc:aggregate
+%mvn_build -f
 
 %install
-# jar
-install -Dpm 644 target/%{site_name}-%{version}.jar %{buildroot}%{_javadir}/%{grp_name}/%{name}.jar
-
-# pom
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{grp_name}-%{name}.pom
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%mvn_install
 
-%add_maven_depmap JPP.%{grp_name}-%{name}.pom %{grp_name}/%{name}.jar
-
-%files
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc LICENSE NOTICE DEPENDENCIES
-%{_javadir}/%{grp_name}/%{name}.jar
-%{_mavenpomdir}/JPP.%{grp_name}-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
 %changelog
+* Wed Aug 07 2013 Marek Goldmann <mgoldman at redhat.com> - 1.4.0-9
+- Using xmvn
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild