From 5aa3607bde5ad60c7f17b596c95d21659173e444 Mon Sep 17 00:00:00 2001
From: Alexander Kurtakov <akurtako@redhat.com>
Date: May 16 2014 13:38:15 +0000
Subject: Start using mvn_build/install.


---

diff --git a/felix-gogo-shell.spec b/felix-gogo-shell.spec
index cbace7e..6961e7c 100644
--- a/felix-gogo-shell.spec
+++ b/felix-gogo-shell.spec
@@ -6,7 +6,7 @@
 
 Name:             %{?scl_prefix}%{project}-gogo-shell
 Version:          0.10.0
-Release:          10%{?dist}
+Release:          11%{?dist}
 Summary:          Community OSGi R4 Service Platform Implementation - Basic Commands
 Group:            Development/Tools
 License:          ASL 2.0
@@ -24,9 +24,8 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1.7.0
 BuildRequires:    jpackage-utils
 BuildRequires:    maven-local
-BuildRequires:    xmvn
 BuildRequires:    maven-plugin-bundle
-BuildRequires:    maven-surefire-provider-junit4
+BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    %{?scl_prefix}felix-gogo-parent
 BuildRequires:    %{?scl_prefix}felix-gogo-runtime
 BuildRequires:    felix-osgi-compendium
@@ -51,7 +50,6 @@ dynamic service deployment framework that is amenable to remote management.
 %package javadoc
 Group:            Documentation
 Summary:          Javadoc for %{pkg_name}
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{pkg_name}.
@@ -63,34 +61,27 @@ This package contains the API documentation for %{pkg_name}.
 
 %build
 %{?scl:%scl_maven_opts}
-mvn-rpmbuild install javadoc:aggregate 
+%mvn_build
 
 %install
 # jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{project}
-install -pm 644 target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}/%{project}/%{bundle}.jar
-
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%add_maven_depmap JPP.%{project}-%{bundle}.pom %{project}/%{bundle}.jar
+%mvn_install
 
 # javadoc
 install -d -m 0755 %{buildroot}%{_javadocdir}/%{pkg_name}
 cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{pkg_name}
 
 
-%files
+%files -f .mfiles
 %doc DEPENDENCIES LICENSE NOTICE
-%{_javadir}/*
-%{_mavenpomdir}/JPP.%{project}-%{bundle}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%{_javadocdir}/%{pkg_name}
 
 %changelog
+* Fri May 16 2014 Alexander Kurtakov <akurtako@redhat.com> 0.10.0-11
+- Start using mvn_build/install.
+
 * Tue Mar 04 2014 Stanislav Ochotnicky <sochotnicky@redhat.com> - 0.10.0-10
 - Use Requires: java-headless rebuild (#1067528)