From 87b0c4397a393aae6111d104ec522410344860db Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: May 24 2018 08:26:40 +0000 Subject: Update to upstream version 2.14.6 --- diff --git a/.gitignore b/.gitignore index b9f7b12..6c397b7 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ jline-1.0.zip /jline-2.10.tar.xz /jline-2.12.1.tar.xz /jline-2.13.tar.xz +/jline-2.14.6.tar.gz diff --git a/jline.spec b/jline.spec index 71f0962..c98fb85 100644 --- a/jline.spec +++ b/jline.spec @@ -1,14 +1,12 @@ Name: jline -Version: 2.13 -Release: 12%{?dist} +Version: 2.14.6 +Release: 1%{?dist} Summary: JLine is a Java library for handling console input License: BSD URL: https://github.com/jline/jline2 BuildArch: noarch -# git clone git://github.com/jline/jline2.git -# cd jline2/ && git archive --format=tar --prefix=jline-2.13/ jline-2.13 | xz > jline-2.13.tar.xz -Source0: jline-%{version}.tar.xz +Source0: https://github.com/jline/jline2/archive/jline-%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(junit:junit) @@ -39,7 +37,7 @@ Provides: jline2-javadoc = %{version}-%{release} This package contains the API documentation for %{name}. %prep -%setup -q -n jline-%{version} +%setup -q -n jline2-jline-%{version} # Remove maven-shade-plugin usage %pom_remove_plugin "org.apache.maven.plugins:maven-shade-plugin" @@ -49,6 +47,7 @@ This package contains the API documentation for %{name}. # Remove unavailable and unneeded deps %pom_xpath_remove "pom:build/pom:extensions" %pom_remove_plugin :maven-site-plugin +%pom_remove_plugin :maven-enforcer-plugin # Makes the build fail on deprecation warnings from jansi %pom_xpath_remove 'pom:arg[text()="-Werror"]' @@ -79,6 +78,9 @@ find -name TerminalFactoryTest.java -delete %files javadoc -f .mfiles-javadoc %changelog +* Thu May 24 2018 Michael Simacek - 2.14.6-1 +- Update to upstream version 2.14.6 + * Fri Mar 16 2018 Michael Simacek - 2.13-12 - Remove -Werror to fix FTBFS diff --git a/sources b/sources index 70f16a2..9a2357a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -784e2b67d0718f0af547605df06ced27 jline-2.13.tar.xz +SHA512 (jline-2.14.6.tar.gz) = 9e141c9a112dcb4850db95a7c2cec9b84f11be1f6740a3a33c99ec2ed5f900f4dae7474058e14319ef79476121997afbdb248ca22559a82a905c31690afa1d51