From 7bdf6329e4a7f8e85fc6468f4eee43d8c8826120 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Oct 05 2019 15:50:16 +0000 Subject: update to version 1.8 --- diff --git a/.gitignore b/.gitignore index 33e91e0..8afe2ba 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,8 @@ +/results_* +/*.src.rpm + /jansi-native-1.2.tar.xz /jansi-native-1.4.tar.xz /jansi-native-1.5.tar.gz /jansi-native-1.7.tar.gz +/jansi-native-1.8.tar.gz diff --git a/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch b/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch deleted file mode 100644 index b14aeb0..0000000 --- a/0001-Fixing-archiver-requires-AM_PROG_AR-in-configure.ac-.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 324f6f20451942d228ddcc4a2153fd8d9487bddb Mon Sep 17 00:00:00 2001 -From: Marek Goldmann -Date: Tue, 24 Jul 2012 11:39:56 +0200 -Subject: [PATCH] Fixing "archiver requires 'AM_PROG_AR' in 'configure.ac'" - error - ---- - src/main/native-package/m4/custom.m4 | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/main/native-package/m4/custom.m4 b/src/main/native-package/m4/custom.m4 -index 3b5e92e..75cbdec 100644 ---- a/src/main/native-package/m4/custom.m4 -+++ b/src/main/native-package/m4/custom.m4 -@@ -18,4 +18,5 @@ dnl --------------------------------------------------------------------------- - AC_DEFUN([CUSTOM_M4_SETUP], - [ - AC_CHECK_LIB([c], [isatty],[AC_DEFINE([HAVE_ISATTY], [1], [Define to 1 if you have the isatty function.])]) --]) -\ No newline at end of file -+ AM_PROG_AR -+]) --- -1.7.11.2 - diff --git a/jansi-native.spec b/jansi-native.spec index 4d4d146..8050c35 100644 --- a/jansi-native.spec +++ b/jansi-native.spec @@ -1,20 +1,24 @@ %global bits %{__isa_bits} %global debug_package %{nil} +# jansi-native-1.8 tag is missing from git +# https://github.com/fusesource/jansi-native/commit/5015ad0 +%global commit 5015ad023a55785dbe6ad19cc786c0533387feff + Name: jansi-native -Version: 1.7 -Release: 9%{?dist} +Version: 1.8 +Release: 1%{?dist} Summary: Jansi Native implements the JNI Libraries used by the Jansi project License: ASL 2.0 URL: http://jansi.fusesource.org/ -Source0: https://github.com/fusesource/jansi-native/archive/jansi-native-%{version}.tar.gz +Source0: https://github.com/fusesource/jansi-native/archive/%{commit}/jansi-native-%{version}.tar.gz BuildRequires: maven-local BuildRequires: mvn(junit:junit) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.fusesource:fusesource-pom:pom:) -BuildRequires: mvn(org.fusesource.hawtjni:hawtjni-runtime) >= 1.9-2 BuildRequires: mvn(org.fusesource.hawtjni:maven-hawtjni-plugin) >= 1.9-2 +BuildRequires: mvn(org.fusesource.hawtjni:hawtjni-runtime) >= 1.9-2 %description Jansi is a small java library that allows you to use ANSI escape sequences @@ -30,7 +34,7 @@ BuildArch: noarch This package contains the API documentation for %{name}. %prep -%setup -q -n jansi-native-jansi-native-%{version} +%setup -q -n jansi-native-%{commit} %mvn_alias :jansi-linux%{bits} :jansi-linux %mvn_file :jansi-linux%{bits} %{name}/jansi-linux%{bits} %{name}/jansi-linux @@ -50,6 +54,9 @@ This package contains the API documentation for %{name}. %license license.txt %changelog +* Sat Oct 05 2019 Fabio Valentini - 1.8-1 +- Update to version 1.8. + * Thu Jul 25 2019 Fedora Release Engineering - 1.7-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 3ae8229..5bc44a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (jansi-native-1.7.tar.gz) = 59bd5234a24a730d8e8c3fab383d64c460e5b115e37d6f9bd611631077ddbc7749c444ad803228fb3d914be57fe78accb419a5692da60d0a306af043f58fcb32 +SHA512 (jansi-native-1.8.tar.gz) = 258a93c4199127610b4dd57d6ff7b12cec05ddd20d32f5b9adf5487ef348ff00a835fe4e0ff8ae8c1f7959fdc60c1584179d1c65463e5b131002b5df8decbd61