[hawtdispatch] First build for EPEL7.

Darryl L. Pierce mcpierce at fedoraproject.org
Wed Aug 27 14:07:19 UTC 2014


commit 8ac397752cab031544021df18f59b560c55ebddd
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Wed Aug 27 10:05:51 2014 -0400

    First build for EPEL7.

 hawtdispatch.spec |   22 +++++++++++++++++++---
 1 files changed, 19 insertions(+), 3 deletions(-)
---
diff --git a/hawtdispatch.spec b/hawtdispatch.spec
index 5d4c0b3..f3ed7bc 100644
--- a/hawtdispatch.spec
+++ b/hawtdispatch.spec
@@ -1,18 +1,27 @@
 Name:          hawtdispatch
 Version:       1.17
-Release:       6%{?dist}
+Release:       7%{?dist}
 Summary:       The libdispatch style API for Java
 License:       ASL 2.0
 URL:           http://hawtdispatch.fusesource.org/
 Source0:       https://github.com/fusesource/hawtdispatch/archive/%{name}-project-%{version}.tar.gz
 
 BuildRequires: java-devel
+%if (0%{?rhel} > 0) || (0%{?fedora} < 21)
+BuildRequires: mvn(org.fusesource:fusesource-pom)
+%else
 BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
+%endif
 BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf)
 BuildRequires: mvn(org.osgi:org.osgi.compendium)
 BuildRequires: mvn(org.osgi:org.osgi.core)
 #BuildRequires: mvn(asm:asm-tree)
+
+%if (0%{?fedora} > 20)
 BuildRequires: objectweb-asm3
+%else
+BuildRequires: objectweb-asm4
+%endif
 
 %if 0
 # unavailable sub module deps
@@ -36,7 +45,11 @@ BuildRequires: mvn(org.slf4j:slf4j-nop)
 
 # test deps
 BuildRequires: mvn(junit:junit)
-BuildRequires: mvn(log4j:log4j:1.2.17)
+%if (0%{?rhel} > 0) || (0%{?fedora} < 21)
+BuildRequires: log4j
+%else
+BuildRequires: log4j12
+%endif
 
 BuildRequires: maven-local
 BuildRequires: maven-plugin-bundle
@@ -104,6 +117,9 @@ This package contains javadoc for %{name}.
 %doc license.txt notice.md
 
 %changelog
+* Wed Aug 27 2014 Darryl L. Pierce <dpierce at redhat.com> - 1.17-7
+- First build for EPEL7.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.17-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -124,4 +140,4 @@ This package contains javadoc for %{name}.
 - update to 1.17
 
 * Thu May 24 2012 gil cattaneo <puntogil at libero.it> 1.11-1
-- initial rpm
\ No newline at end of file
+- initial rpm


More information about the scm-commits mailing list