[activemq] Fix FTBFS
Michal Srb
msrb at fedoraproject.org
Mon Jun 16 11:22:13 UTC 2014
commit cbf6ae04e59f96705e932599a1e1e2d46b044c3c
Author: Michal Srb <msrb at redhat.com>
Date: Mon Jun 16 13:10:10 2014 +0200
Fix FTBFS
activemq.spec | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/activemq.spec b/activemq.spec
index 0f18f99..0ed0e8a 100644
--- a/activemq.spec
+++ b/activemq.spec
@@ -1,6 +1,6 @@
Name: activemq
Version: 5.6.0
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Open source messaging and Integration Patterns server
License: ASL 2.0
URL: http://activemq.apache.org
@@ -28,7 +28,7 @@ BuildRequires: maven-pmd-plugin
BuildRequires: maven-release-plugin
BuildRequires: maven-source-plugin
BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
+BuildRequires: maven-surefire-provider-junit
BuildRequires: maven-xbean-plugin
BuildRequires: maven-local
BuildRequires: springframework-jms
@@ -122,11 +122,13 @@ chmod 644 LICENSE README.txt
mv LICENSE LICENSE.orig
iconv -f iso-8859-1 -t utf-8 LICENSE.orig > LICENSE
-%build
-%mvn_package :activemq-core core
-%mvn_package :activemq-jaas jaas
-%mvn_package :kahadb kahadb
+%mvn_package ":activemq-core:{xsd}::" __noinstall
+%mvn_package ":activemq-core:{jar,pom}:{}:" core
+%mvn_package ":activemq-jaas:{jar,pom}:{}:" jaas
+%mvn_package ":kahadb:{jar,pom}:{}:" kahadb
+
+%build
%mvn_build -f
%install
@@ -148,6 +150,9 @@ iconv -f iso-8859-1 -t utf-8 LICENSE.orig > LICENSE
%doc LICENSE NOTICE
%changelog
+* Mon Jun 16 2014 Michal Srb <msrb at redhat.com> - 5.6.0-9
+- Fix FTBFS
+
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.6.0-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
More information about the scm-commits
mailing list