[plexus-bsh-factory] Build with xmvn

[Michal Srb]

commit 8b8dd3745ed7dbd8e27c0d0a4ba319d587256baf
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Jan 23 13:59:33 2013 +0100

    Build with xmvn

 plexus-bsh-factory.spec |   39 ++++++++++-----------------------------
 1 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/plexus-bsh-factory.spec b/plexus-bsh-factory.spec
index 42c11d8..a7a3e1e 100644
--- a/plexus-bsh-factory.spec
+++ b/plexus-bsh-factory.spec
@@ -33,7 +33,7 @@
 
 Name:           %{parent}-%{subname}
 Version:        1.0
-Release:        0.8.a7%{?dist}
+Release:        0.9.a7%{?dist}
 Epoch:          0
 Summary:        Plexus Bsh component factory
 License:        MIT
@@ -50,7 +50,7 @@ Patch1:         %{name}-encodingfix.patch
 BuildArch:      noarch
 
 BuildRequires:     jpackage-utils
-BuildRequires:     maven
+BuildRequires:     xmvn
 BuildRequires:     maven-compiler-plugin
 BuildRequires:     maven-install-plugin
 BuildRequires:     maven-jar-plugin
@@ -62,11 +62,6 @@ BuildRequires:     classworlds
 BuildRequires:     plexus-container-default
 BuildRequires:     plexus-utils
 
-Requires:          bsh
-Requires:          classworlds
-Requires:          plexus-utils
-# the only user of this code doesn't use problematic parts of API
-Requires:          plexus-containers-container-default
 
 %description
 Bsh component class creator for Plexus.
@@ -74,7 +69,6 @@ Bsh component class creator for Plexus.
 %package javadoc
 Summary:        Javadoc for %{name}
 Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 Javadoc for %{name}.
@@ -89,41 +83,28 @@ cp -p %{SOURCE3} .
 
 
 %build
+%mvn_file  : %{parent}/%{subname}
 # depmap used to compile so we resolve old plexus-container-default
 # At runtime we use new plexus-containers-container-default because our only
 # runtime user is maven-plugin-tools/maven-script-beanshell which doesn't cause
 # problems with old/new API
-mvn-rpmbuild -Dmaven.local.depmap.file=%{SOURCE1} \
-             -Dmaven.test.skip=true \
-             package javadoc:aggregate
+export XMVN_RESOLV_DEPMAPS=",%{SOURCE1}"
+%mvn_build -f
 
 %install
-# jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/plexus
-install -pm 644 target/*.jar \
-      $RPM_BUILD_ROOT%{_javadir}/%{parent}/%{subname}.jar
-
-# pom
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 \
-  pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.%{parent}-%{subname}.pom
-
-%add_maven_depmap JPP.%{parent}-%{subname}.pom %{parent}/%{subname}.jar
-
-# javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* \
-       $RPM_BUILD_ROOT%{_javadocdir}/%{name}/
+%mvn_install
 
 
 %files -f .mfiles
 %doc plexus-bsh-factory-license.txt
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc plexus-bsh-factory-license.txt
-%doc %{_javadocdir}/*
 
 %changelog
+* Wed Jan 23 2013 Michal Srb <msrb at redhat.com> - 0:1.0-0.9.a7
+- Build with xmvn
+
 * Thu Nov 22 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0:1.0-0.8.a7
 - Cleanup whole spec file (#878828)
 - Build/install javadoc package (#878134, #878135)