[hawtbuf] Update to 1.11
gil
gil at fedoraproject.org
Tue Jan 20 05:54:21 UTC 2015
commit 0c535ffddb2c3a9373b27a6721d9b0140c19b7f6
Author: gil <puntogil at libero.it>
Date: Tue Jan 20 06:54:30 2015 +0100
Update to 1.11
.gitignore | 1 +
hawtbuf.spec | 37 ++++++++++++++++++-------------------
sources | 2 +-
3 files changed, 20 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 80fc853..23233b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
/hawtbuf-1.9.tar.xz
/hawtbuf-project-1.9.tar.gz
+/hawtbuf-project-1.11.tar.gz
diff --git a/hawtbuf.spec b/hawtbuf.spec
index 4941abc..c07297a 100644
--- a/hawtbuf.spec
+++ b/hawtbuf.spec
@@ -1,16 +1,19 @@
Name: hawtbuf
-Version: 1.9
-Release: 10%{?dist}
+Version: 1.11
+Release: 1%{?dist}
Summary: A rich byte buffer library
License: ASL 2.0
URL: https://github.com/fusesource/hawtbuf/
Source0: https://github.com/fusesource/hawtbuf/archive/%{name}-project-%{version}.tar.gz
-BuildRequires: java-devel
-
-%if 0%{?fedora} < 21
+%if (0%{?rhel} > 0) || (0%{?fedora} < 21)
+BuildRequires: mvn(log4j:log4j)
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components)
BuildRequires: mvn(org.fusesource:fusesource-pom)
%else
+BuildRequires: mvn(log4j:log4j:1.2.17)
+# B/R for maven-archiver
+BuildRequires: mvn(org.apache.maven.shared:maven-shared-components:pom:)
BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
%endif
BuildRequires: mvn(commons-logging:commons-logging)
@@ -20,12 +23,6 @@ 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
BuildRequires: maven-invoker-plugin
@@ -33,13 +30,6 @@ BuildRequires: maven-plugin-bundle
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
%description
@@ -73,8 +63,14 @@ This package contains javadoc for %{name}.
%setup -q -n %{name}-%{name}-project-%{version}
%pom_remove_plugin :maven-assembly-plugin
-%build
+%if (0%{?rhel} > 0) || (0%{?fedora} >= 21)
+%pom_xpath_set "pom:properties/pom:log4j-version" 1.2.17
+%endif
+
%mvn_package ":%{name}-project" %{name}
+
+%build
+
%mvn_build -s
%install
@@ -94,6 +90,9 @@ This package contains javadoc for %{name}.
%doc license.txt notice.md
%changelog
+* Tue Jan 20 2015 gil cattaneo <puntogil at libero.it> 1.11-1
+- Update to 1.11
+
* Wed Aug 20 2014 Darryl L. Pierce <dpierce at redhat.com> - 1.9-10
- First build for EPEL7.
- Resolves: BZ#1110028
diff --git a/sources b/sources
index e1ded98..4b6af13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4b9a5b4992ea7b93952d85691e1ce708 hawtbuf-project-1.9.tar.gz
+5a6c92beffaff1d51cf0c8e6edd89657 hawtbuf-project-1.11.tar.gz
More information about the scm-commits
mailing list