[activemq] Fixes Remove binary distribution usage, RHBZ#1018696

[Marek Goldmann]

commit 3d5342a0c237cdf9445177809d82142064181ebf
Author: Marek Goldmann <marek.goldmann at gmail.com>
Date:   Mon Oct 14 10:44:56 2013 +0200

    Fixes Remove binary distribution usage, RHBZ#1018696

 activemq.spec |   85 +++++++++++---------------------------------------------
 1 files changed, 17 insertions(+), 68 deletions(-)
---
diff --git a/activemq.spec b/activemq.spec
index 846d39e..eadc275 100644
--- a/activemq.spec
+++ b/activemq.spec
@@ -1,8 +1,7 @@
 Name:          activemq
 Version:       5.6.0
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       Open source messaging and Integration Patterns server
-Group:         Development/Libraries
 License:       ASL 2.0
 URL:           http://activemq.apache.org
 # git clone -b activemq-5.6.0 https://github.com/apache/activemq.git activemq-core-5.6.0
@@ -18,7 +17,6 @@ BuildRequires: jasypt
 BuildRequires: javacc-maven-plugin
 BuildRequires: java-devel
 BuildRequires: jettison
-BuildRequires: jpackage-utils
 BuildRequires: maven-clean-plugin
 BuildRequires: maven-compiler-plugin
 BuildRequires: maven-enforcer-plugin
@@ -32,66 +30,35 @@ BuildRequires: maven-source-plugin
 BuildRequires: maven-surefire-plugin
 BuildRequires: maven-surefire-provider-junit4
 BuildRequires: maven-xbean-plugin
+BuildRequires: maven-local
 BuildRequires: springframework-jms
 
-# Required for /usr/share/java/activemq directory
-Requires: activemq-protobuf
-
-Requires: java
-Requires: jpackage-utils
-
 BuildArch: noarch
 
-
 %description
 The most popular and powerful open source messaging and Integration Patterns
 server.
 
 %package javadoc
-Group: Documentation
 Summary: Javadoc for %{name}
-Requires: jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}
 
 %package core
-Group: Development/Libraries
 Summary: ActiveMQ Core
-Requires: %{name}        = %{version}-%{release}
-Requires: %{name}-jaas   = %{version}-%{release}
-Requires: %{name}-kahadb = %{version}-%{release}
-Requires: jpackage-utils
-Requires: java
-Requires: activemq-protobuf
-Requires: activeio
-Requires: jettison
-Requires: springframework-jms
-Requires: geronimo-jta
-Requires: derby
-Requires: jasypt
 
 %description core
 ActiveMQ Core Library
 
 %package jaas
-Group: Development/Libraries
 Summary: ActiveMQ Jaas
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
-Requires: java
 
 %description jaas
 ActiveMQ Jaas Library
 
 %package kahadb
-Group: Development/Libraries
 Summary: ActiveMQ KahaDB
-Requires: %{name} = %{version}-%{release}
-Requires: jpackage-utils
-Requires: java
-Requires: activemq-protobuf
-Requires: activeio
 
 %description kahadb
 A file based persistence database that is local to the message broker that
@@ -156,53 +123,35 @@ mv LICENSE LICENSE.orig
 iconv -f iso-8859-1 -t utf-8 LICENSE.orig > LICENSE
 
 %build
-mvn-rpmbuild -Dmaven.test.skip=true \
-    -Dproject.build.sourceEncoding=UTF-8 \
-    install javadoc:aggregate
-
-%install
+%mvn_package :activemq-core core
+%mvn_package :activemq-jaas jaas
+%mvn_package :kahadb kahadb
 
-install -d -m 755 %{buildroot}%{_javadir}/%{name}
-install -d -m 755 %{buildroot}%{_mavenpomdir}
+%mvn_build -f
 
-for m in %{name}-core %{name}-jaas kahadb; do
-    install -pm 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
-
-# Parent POM
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
+%install
+%mvn_install
 
-%files
+%files -f .mfiles
 %doc LICENSE NOTICE README.txt
-# Not owning /usr/share/java/activemq since it is owned by activemq-protobuf
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE NOTICE
-%{_javadocdir}/%{name}
 
-%files core
+%files core -f .mfiles-core
 %doc LICENSE NOTICE
-%{_javadir}/%{name}/%{name}-core.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-core.pom
 
-%files jaas
+%files jaas -f .mfiles-jaas
 %doc LICENSE NOTICE
-%{_javadir}/%{name}/%{name}-jaas.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-jaas.pom
 
-%files kahadb
+%files kahadb -f .mfiles-kahadb
 %doc LICENSE NOTICE
-%{_javadir}/%{name}/kahadb.jar
-%{_mavenpomdir}/JPP.%{name}-kahadb.pom
 
 %changelog
+* Mon Oct 14 2013 Marek Goldmann <mgoldman at redhat.com> - 5.6.0-7
+- Use xmvn
+- Fixes Remove binary distribution usage, RHBZ#1018696
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.6.0-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild