From ae4cb5de28a04748c411a1cd420abd67f053c73b Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Fri, 9 May 2014 12:53:56 +0100 Subject: [PATCH] Update to latest upstream, fixes rhbz #1079510 Add patch for javadoc errors --- .gitignore | 10 ++++++---- jzlib.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 27bc140..0c733ae 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -jzlib-1.0.7.tar.gz -jzlib-1.1.0.tar.gz -/jzlib-1.1.1.zip -/1.1.2.tar.gz +/*.tar.gz +/jzlib-*/ +/.project +/noarch +/*.src.rpm +/.build-*.log diff --git a/jzlib.spec b/jzlib.spec index f9f960f..a112a31 100644 --- a/jzlib.spec +++ b/jzlib.spec @@ -1,6 +1,6 @@ Name: jzlib -Version: 1.1.2 -Release: 3%{?dist} +Version: 1.1.3 +Release: 1%{?dist} Epoch: 0 Summary: Re-implementation of zlib in pure Java License: BSD @@ -8,6 +8,9 @@ URL: http://www.jcraft.com/jzlib/ BuildArch: noarch Source0: https://github.com/ymnk/jzlib/archive/%{version}.tar.gz +# This patch is sent upstream: https://github.com/ymnk/jzlib/pull/15 +Patch0: jzlib-javadoc-fixes.patch + BuildRequires: maven-local %description @@ -32,6 +35,8 @@ Requires: %{name} = %{epoch}:%{version}-%{release} %prep %setup -q +%patch0 + %mvn_file : %{name} %build @@ -54,6 +59,10 @@ cp -pr example/* %{buildroot}%{_datadir}/%{name} %doc %{_datadir}/%{name} %changelog +* Fri May 09 2014 Mat Booth - 0:1.1.3-1 +- Update to latest upstream, fixes rhbz #1079510 +- Add patch for javadoc errors + * Tue Mar 04 2014 Stanislav Ochotnicky - 0:1.1.2-3 - Use Requires: java-headless rebuild (#1067528) diff --git a/sources b/sources index 24d5ed0..ea02bc4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f220e253a1edde7394d13d3042978805 1.1.2.tar.gz +f7cea898d9c0834f457f39e3a425a2cf 1.1.3.tar.gz