[hawtbuf] First build for EPEL7.

Darryl L. Pierce mcpierce at fedoraproject.org
Thu Aug 21 18:07:37 UTC 2014


commit 482a6a3e2b10d52d5375c8da637663f421f763c2
Author: Darryl L. Pierce <mcpierce at gmail.com>
Date:   Thu Aug 21 14:06:23 2014 -0400

    First build for EPEL7.
    
    - Resolves: BZ#1110028
    - Added conditions so the specfile can be used across releases.

 hawtbuf.spec |   22 ++++++++++++++++++++--
 1 files changed, 20 insertions(+), 2 deletions(-)
---
diff --git a/hawtbuf.spec b/hawtbuf.spec
index 16fc14f..4941abc 100644
--- a/hawtbuf.spec
+++ b/hawtbuf.spec
@@ -1,6 +1,6 @@
 Name:          hawtbuf
 Version:       1.9
-Release:       9%{?dist}
+Release:       10%{?dist}
 Summary:       A rich byte buffer library
 License:       ASL 2.0
 URL:           https://github.com/fusesource/hawtbuf/
@@ -8,14 +8,23 @@ Source0:       https://github.com/fusesource/hawtbuf/archive/%{name}-project-%{v
 
 BuildRequires: java-devel
 
+%if 0%{?fedora} < 21
+BuildRequires: mvn(org.fusesource:fusesource-pom)
+%else
 BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
+%endif
 BuildRequires: mvn(commons-logging:commons-logging)
 BuildRequires: mvn(org.apache.maven:maven-plugin-api)
 BuildRequires: mvn(org.apache.maven:maven-project)
 
 # test deps
 BuildRequires: junit
+
+%if (0%{?rhel} > 0) || (0%{?fedora} < 21)
+BuildRequires: log4j
+%else
 BuildRequires: log4j12
+%endif
 
 BuildRequires: maven-local
 BuildRequires: javacc-maven-plugin
@@ -25,7 +34,11 @@ BuildRequires: maven-plugin-plugin
 BuildRequires: maven-surefire-provider-junit
 
 # B/R for maven-archiver
+%if 0%{?fedora} < 21
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
+%else
 BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
+%endif
 
 BuildArch:     noarch
 
@@ -81,6 +94,11 @@ This package contains javadoc for %{name}.
 %doc license.txt notice.md
 
 %changelog
+* Wed Aug 20 2014 Darryl L. Pierce <dpierce at redhat.com> - 1.9-10
+- First build for EPEL7.
+- Resolves: BZ#1110028
+- Added conditions so the specfile can be used across releases.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.9-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -109,4 +127,4 @@ This package contains javadoc for %{name}.
 - performed integration test
 
 * Tue May 22 2012 gil cattaneo <puntogil at libero.it> 1.9-1
-- initial rpm
\ No newline at end of file
+- initial rpm


More information about the scm-commits mailing list