[bookkeeper] switch to XMvn, minor changes to adapt to current guideline

[gil]

commit 06d2ebf3cedf78f9fd12d82638de16fe5c94d45a
Author: gil <puntogil at libero.it>
Date:   Sat Jun 29 13:11:57 2013 +0200

    switch to XMvn, minor changes to adapt to current guideline

 bookkeeper.spec |   55 ++++++++-----------------------------------------------
 1 files changed, 8 insertions(+), 47 deletions(-)
---
diff --git a/bookkeeper.spec b/bookkeeper.spec
index 5004d87..6266ba5 100644
--- a/bookkeeper.spec
+++ b/bookkeeper.spec
@@ -1,7 +1,7 @@
 %global _hardened_build 1
 Name:          bookkeeper
 Version:       4.2.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       Apache BookKeeper sub-project of ZooKeeper
 Group:         Development/Libraries
 License:       ASL 2.0
@@ -65,7 +65,6 @@ BuildRequires: maven-assembly-plugin
 BuildRequires: maven-dependency-plugin
 BuildRequires: maven-remote-resources-plugin
 BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
 
 
 %description
@@ -90,32 +89,13 @@ Requires:      libhedwig%{?_isa} = %{version}-%{release}
 Development files for the Hedwig C client library.
 
 %package java
-Group:         Development/Libraries
 Summary:       BookKeeper/Hedwig Java libraries
-Requires:      apache-commons-cli
-Requires:      apache-commons-collections
-Requires:      apache-commons-codec
-Requires:      apache-commons-configuration
-Requires:      apache-commons-io
-Requires:      derby
-Requires:      guava
-Requires:      jline
-Requires:      log4j
-#Requires:      mvn(org.apache.hadoop:hadoop-common) >= 0.23.1
-#Requires:      mvn(org.apache.hadoop:hadoop-hdfs)
-Requires:      netty
-Requires:      protobuf-java
-Requires:      slf4j
-Requires:      zookeeper-java
-Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description java
 This package contains BookKeeper/Hedwig Java libraries.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
 BuildArch:     noarch
 
@@ -127,9 +107,7 @@ This package contains javadoc for %{name}.
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
-%if %{?fedora} > 18
 %patch3 -p0
-%endif
 
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
 %pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin bookkeeper-server
@@ -168,7 +146,7 @@ This package contains javadoc for %{name}.
  protoc --java_out=src/main/java src/main/protobuf/PubSubProtocol.proto
 )
 # test skipped for unavailable test deps
-mvn-rpmbuild -Dmaven.test.skip=true -Dmaven.local.depmap.file="%{SOURCE1}" package javadoc:aggregate
+%mvn_build -f -- -Dmaven.local.depmap.file="%{SOURCE1}"
 
 pushd hedwig-client/src/main/cpp
 rm -rf autom4te.cache
@@ -191,23 +169,7 @@ popd
 
 find %{buildroot} -name '*.la' -exec rm -f {} ';'
 
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}.pom
-%add_maven_depmap JPP.%{name}-%{name}.pom
-
-mkdir -p %{buildroot}%{_javadir}/%{name}
-# bookkeeper-benchmark
-for m in hedwig-client \
-     hedwig-server \
-     hedwig-protocol \
-     bookkeeper-server; do
-    install -m 644 ${m}/target/${m}-%{version}.jar %{buildroot}%{_javadir}/%{name}/${m}.jar
-    install -pm 644 ${m}/pom.xml %{buildroot}%{_mavenpomdir}/JPP.%{name}-${m}.pom
-%add_maven_depmap JPP.%{name}-${m}.pom %{name}/${m}.jar
-done
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
+%mvn_install
 
 %post -n libhedwig -p /sbin/ldconfig
 %postun -n libhedwig -p /sbin/ldconfig
@@ -222,18 +184,17 @@ cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}/
 %{_libdir}/pkgconfig/hedwig-*.pc
 %doc LICENSE NOTICE
 
-%files java
+%files java -f .mfiles
 %dir %{_javadir}/%{name}
-%{_javadir}/%{name}/*.jar
-%{_mavenpomdir}/JPP.%{name}-*.pom
-%{_mavendepmapfragdir}/%{name}
 %doc CHANGES.txt LICENSE NOTICE README
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
 
 %changelog
+* Sat Jun 29 2013 gil cattaneo <puntogil at libero.it> 4.2.1-3
+- switch to XMvn, minor changes to adapt to current guideline
+
 * Fri Jun 21 2013 gil cattaneo <puntogil at libero.it> 4.2.1-2
 - fix unowned directories