From 455b8ef861ea8480bcd96593c24877e6b8020941 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Aug 14 2015 19:33:53 +0000
Subject: fix FTBFS rhbz#1239362


Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/activemq.spec b/activemq.spec
index 6d9c4ef..63dfffc 100644
--- a/activemq.spec
+++ b/activemq.spec
@@ -1,6 +1,6 @@
 Name:          activemq
 Version:       5.6.0
-Release:       10%{?dist}
+Release:       11%{?dist}
 Summary:       Open source messaging and Integration Patterns server
 License:       ASL 2.0
 URL:           http://activemq.apache.org
@@ -9,29 +9,18 @@ URL:           http://activemq.apache.org
 # tar cJf activemq-core-5.6.0.tar.xz activemq-core-5.6.0
 Source0:       activemq-5.6.0.tar.xz
 
-BuildRequires: activeio
-BuildRequires: activemq-protobuf
-BuildRequires: derby
-BuildRequires: geronimo-jta
-BuildRequires: jasypt
-BuildRequires: javacc-maven-plugin
-BuildRequires: java-devel
-BuildRequires: jettison
-BuildRequires: maven-clean-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-enforcer-plugin
-BuildRequires: maven-gpg-plugin
-BuildRequires: maven-idea-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-cobertura
-BuildRequires: maven-pmd-plugin
-BuildRequires: maven-release-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit
-BuildRequires: maven-xbean-plugin
 BuildRequires: maven-local
-BuildRequires: springframework-jms
+BuildRequires: mvn(commons-net:commons-net)
+BuildRequires: mvn(org.apache.derby:derby)
+BuildRequires: mvn(org.apache.activemq:activeio-core)
+BuildRequires: mvn(org.apache.activemq.protobuf:activemq-protobuf)
+BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jta_1.1_spec)
+BuildRequires: mvn(org.apache.maven.plugins:maven-clean-plugin)
+BuildRequires: mvn(org.apache.xbean:maven-xbean-plugin)
+BuildRequires: mvn(org.codehaus.jettison:jettison)
+BuildRequires: mvn(org.codehaus.mojo:javacc-maven-plugin)
+BuildRequires: mvn(org.jasypt:jasypt)
+BuildRequires: mvn(org.springframework:spring-jms)
 
 BuildArch: noarch
 
@@ -83,8 +72,12 @@ done
 # Remove missing plugin for activemq-core
 %pom_remove_dep xsddoc:maven-xsddoc-plugin %{name}-core/pom.xml
 
+
 # Remove missing plugin
 %pom_remove_plugin org.codehaus.mojo:ianal-maven-plugin
+%pom_remove_plugin -r :cobertura-maven-plugin
+# Workaround for new bundle plugin
+%pom_xpath_remove "pom:plugin[pom:artifactId = 'maven-bundle-plugin' ]/pom:configuration"
 
 # Remove missing test dependencies
 %pom_remove_dep org.springframework:spring-test
@@ -135,21 +128,27 @@ iconv -f iso-8859-1 -t utf-8 LICENSE.orig > LICENSE
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE README.txt
+%doc README.txt
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files core -f .mfiles-core
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files jaas -f .mfiles-jaas
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %files kahadb -f .mfiles-kahadb
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Sun Aug 09 2015 gil cattaneo <puntogil@libero.it> 5.6.0-11
+- fix FTBFS rhbz#1239362
+- fix BR list and use BR mvn()-like
+- introduce license macro
+
 * Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.6.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild