import jansi-1.18-3.module+el8.3.0+7256+fe62c937
This commit is contained in:
commit
4f35c0161b
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
SOURCES/jansi-project-1.18.tar.gz
|
1
.jansi.metadata
Normal file
1
.jansi.metadata
Normal file
@ -0,0 +1 @@
|
||||
9351d9d21aeef3a8db731718dca8a64e79addb63 SOURCES/jansi-project-1.18.tar.gz
|
132
SOURCES/0001-Drop-dependency-on-native-library.patch
Normal file
132
SOURCES/0001-Drop-dependency-on-native-library.patch
Normal file
@ -0,0 +1,132 @@
|
||||
From 9267e184753020dbe436868ac4c6377f58e4500f Mon Sep 17 00:00:00 2001
|
||||
From: Mikolaj Izdebski <mizdebsk@redhat.com>
|
||||
Date: Tue, 5 Nov 2019 15:41:45 +0100
|
||||
Subject: [PATCH] Drop dependency on native library
|
||||
|
||||
---
|
||||
.../org/fusesource/jansi/AnsiConsole.java | 64 ++-----------------
|
||||
1 file changed, 6 insertions(+), 58 deletions(-)
|
||||
|
||||
diff --git a/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java b/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java
|
||||
index d7a37b0..6e0d316 100644
|
||||
--- a/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java
|
||||
+++ b/jansi/src/main/java/org/fusesource/jansi/AnsiConsole.java
|
||||
@@ -15,10 +15,6 @@
|
||||
*/
|
||||
package org.fusesource.jansi;
|
||||
|
||||
-import static org.fusesource.jansi.internal.CLibrary.STDERR_FILENO;
|
||||
-import static org.fusesource.jansi.internal.CLibrary.STDOUT_FILENO;
|
||||
-import static org.fusesource.jansi.internal.CLibrary.isatty;
|
||||
-
|
||||
import java.io.FilterOutputStream;
|
||||
import java.io.IOException;
|
||||
import java.io.OutputStream;
|
||||
@@ -75,36 +71,20 @@ public class AnsiConsole {
|
||||
|
||||
@Deprecated
|
||||
public static OutputStream wrapOutputStream(final OutputStream stream) {
|
||||
- try {
|
||||
- return wrapOutputStream(stream, STDOUT_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- return wrapOutputStream(stream, 1);
|
||||
- }
|
||||
+ return wrapOutputStream(stream, 1);
|
||||
}
|
||||
|
||||
public static PrintStream wrapSystemOut(final PrintStream ps) {
|
||||
- try {
|
||||
- return wrapPrintStream(ps, STDOUT_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- return wrapPrintStream(ps, 1);
|
||||
- }
|
||||
+ return wrapPrintStream(ps, 1);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
public static OutputStream wrapErrorOutputStream(final OutputStream stream) {
|
||||
- try {
|
||||
- return wrapOutputStream(stream, STDERR_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- return wrapOutputStream(stream, 2);
|
||||
- }
|
||||
+ return wrapOutputStream(stream, 2);
|
||||
}
|
||||
|
||||
public static PrintStream wrapSystemErr(final PrintStream ps) {
|
||||
- try {
|
||||
- return wrapPrintStream(ps, STDERR_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- return wrapPrintStream(ps, 2);
|
||||
- }
|
||||
+ return wrapPrintStream(ps, 2);
|
||||
}
|
||||
|
||||
@Deprecated
|
||||
@@ -124,22 +104,6 @@ public class AnsiConsole {
|
||||
return new AnsiOutputStream(stream);
|
||||
}
|
||||
|
||||
- if (IS_WINDOWS && !IS_CYGWIN && !IS_MINGW_XTERM) {
|
||||
-
|
||||
- // On windows we know the console does not interpret ANSI codes..
|
||||
- try {
|
||||
- jansiOutputType = JansiOutputType.WINDOWS;
|
||||
- return new WindowsAnsiOutputStream(stream, fileno == STDOUT_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- // this happens when JNA is not in the path.. or
|
||||
- // this happens when the stdout is being redirected to a file.
|
||||
- }
|
||||
-
|
||||
- // Use the ANSIOutputStream to strip out the ANSI escape sequences.
|
||||
- jansiOutputType = JansiOutputType.STRIP_ANSI;
|
||||
- return new AnsiOutputStream(stream);
|
||||
- }
|
||||
-
|
||||
// We must be on some Unix variant, including Cygwin or MSYS(2) on Windows...
|
||||
try {
|
||||
// If the jansi.force property is set, then we force to output
|
||||
@@ -147,7 +111,7 @@ public class AnsiConsole {
|
||||
boolean forceColored = Boolean.getBoolean("jansi.force");
|
||||
// If we can detect that stdout is not a tty.. then setup
|
||||
// to strip the ANSI sequences..
|
||||
- if (!forceColored && isatty(fileno) == 0) {
|
||||
+ if (!forceColored && System.console() == null) {
|
||||
jansiOutputType = JansiOutputType.STRIP_ANSI;
|
||||
return new AnsiOutputStream(stream);
|
||||
}
|
||||
@@ -202,22 +166,6 @@ public class AnsiConsole {
|
||||
return new AnsiPrintStream(ps);
|
||||
}
|
||||
|
||||
- if (IS_WINDOWS && !IS_CYGWIN && !IS_MINGW_XTERM) {
|
||||
-
|
||||
- // On windows we know the console does not interpret ANSI codes..
|
||||
- try {
|
||||
- jansiOutputType = JansiOutputType.WINDOWS;
|
||||
- return new WindowsAnsiPrintStream(ps, fileno == STDOUT_FILENO);
|
||||
- } catch (Throwable ignore) {
|
||||
- // this happens when JNA is not in the path.. or
|
||||
- // this happens when the stdout is being redirected to a file.
|
||||
- }
|
||||
-
|
||||
- // Use the AnsiPrintStream to strip out the ANSI escape sequences.
|
||||
- jansiOutputType = JansiOutputType.STRIP_ANSI;
|
||||
- return new AnsiPrintStream(ps);
|
||||
- }
|
||||
-
|
||||
// We must be on some Unix variant, including Cygwin or MSYS(2) on Windows...
|
||||
try {
|
||||
// If the jansi.force property is set, then we force to output
|
||||
@@ -225,7 +173,7 @@ public class AnsiConsole {
|
||||
boolean forceColored = Boolean.getBoolean("jansi.force");
|
||||
// If we can detect that stdout is not a tty.. then setup
|
||||
// to strip the ANSI sequences..
|
||||
- if (!forceColored && isatty(fileno) == 0) {
|
||||
+ if (!forceColored && System.console() == null) {
|
||||
jansiOutputType = JansiOutputType.STRIP_ANSI;
|
||||
return new AnsiPrintStream(ps);
|
||||
}
|
||||
--
|
||||
2.21.0
|
||||
|
161
SPECS/jansi.spec
Normal file
161
SPECS/jansi.spec
Normal file
@ -0,0 +1,161 @@
|
||||
Name: jansi
|
||||
Version: 1.18
|
||||
Release: 3%{?dist}
|
||||
Summary: Jansi is a java library for generating and interpreting ANSI escape sequences
|
||||
License: ASL 2.0
|
||||
URL: http://fusesource.github.io/jansi/
|
||||
BuildArch: noarch
|
||||
|
||||
Source0: https://github.com/fusesource/jansi/archive/jansi-project-%{version}.tar.gz
|
||||
|
||||
Patch0: 0001-Drop-dependency-on-native-library.patch
|
||||
|
||||
BuildRequires: maven-local
|
||||
BuildRequires: mvn(junit:junit)
|
||||
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
|
||||
BuildRequires: mvn(org.fusesource:fusesource-pom:pom:)
|
||||
|
||||
%description
|
||||
Jansi is a small java library that allows you to use ANSI escape sequences
|
||||
in your Java console applications. It implements ANSI support on platforms
|
||||
which don't support it like Windows and provides graceful degradation for
|
||||
when output is being sent to output devices which cannot support ANSI sequences.
|
||||
|
||||
%{?module_package}
|
||||
%{?javadoc_package}
|
||||
|
||||
%prep
|
||||
%setup -q -n jansi-jansi-project-%{version}
|
||||
%patch0 -p1
|
||||
|
||||
%pom_disable_module example
|
||||
%pom_xpath_remove "pom:build/pom:extensions"
|
||||
|
||||
%pom_remove_plugin -r :maven-site-plugin
|
||||
|
||||
# No maven-uberize-plugin
|
||||
%pom_remove_plugin -r :maven-uberize-plugin
|
||||
|
||||
# Remove unnecessary deps for jansi-native builds
|
||||
pushd jansi
|
||||
%pom_remove_dep :jansi-windows32
|
||||
%pom_remove_dep :jansi-windows64
|
||||
%pom_remove_dep :jansi-osx
|
||||
%pom_remove_dep :jansi-freebsd32
|
||||
%pom_remove_dep :jansi-freebsd64
|
||||
# it's there only to be bundled in uberjar and we disable uberjar generation
|
||||
%pom_remove_dep :jansi-linux32
|
||||
%pom_remove_dep :jansi-linux64
|
||||
#
|
||||
%pom_remove_dep :jansi-native
|
||||
%pom_remove_dep :hawtjni-runtime
|
||||
popd
|
||||
|
||||
# javadoc generation fails due to strict doclint in JDK 8
|
||||
%pom_remove_plugin -r :maven-javadoc-plugin
|
||||
|
||||
rm -f jansi/src/{main,test}/java/org/fusesource/jansi/{WindowsSupport,WindowsAnsiOutputStream,WindowsAnsiPrintStream,WindowsSupportTest,AnsiMain}.java
|
||||
|
||||
|
||||
%build
|
||||
%mvn_build
|
||||
|
||||
%install
|
||||
%mvn_install
|
||||
|
||||
%files -n %{?module_prefix}%{name} -f .mfiles
|
||||
%license license.txt
|
||||
%doc readme.md changelog.md
|
||||
|
||||
%changelog
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-3
|
||||
- Mass rebuild for javapackages-tools 201902
|
||||
|
||||
* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.18-2
|
||||
- Remove dependency on jansi-native and hawtjni
|
||||
|
||||
* Mon Jul 22 2019 Marian Koncek <mkoncek@redhat.com> - 1.18-1
|
||||
- Update to upstream version 1.18
|
||||
|
||||
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.17.1-2
|
||||
- Mass rebuild for javapackages-tools 201901
|
||||
|
||||
* Tue Jun 05 2018 Michael Simacek <msimacek@redhat.com> - 1.17.1-1
|
||||
- Update to upstream version 1.17.1
|
||||
|
||||
* Mon Feb 26 2018 Michael Simacek <msimacek@redhat.com> - 1.17-1
|
||||
- Update to upstream version 1.17
|
||||
|
||||
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.16-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Jun 14 2017 Michael Simacek <msimacek@redhat.com> - 1.16-1
|
||||
- Update to upstream version 1.16
|
||||
|
||||
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-12
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Wed Feb 01 2017 Michael Simacek <msimacek@redhat.com> - 1.11-11
|
||||
- Remove BR on maven-site-plugin
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.11-10
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-9
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Thu May 14 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-8
|
||||
- Remove maven-javadoc-plugin execution
|
||||
|
||||
* Tue Jan 27 2015 Mat Booth <mat.booth@redhat.com> - 1.11-7
|
||||
- Add/remove BRs to fix FTBFS bug
|
||||
|
||||
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-5
|
||||
- Migrate BuildRequires from junit4 to junit
|
||||
|
||||
* Mon May 26 2014 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11-4
|
||||
- Remove BuildRequires on maven-surefire-provider-junit4
|
||||
|
||||
* Wed Sep 11 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-3
|
||||
- Using xmvn
|
||||
- Remove the jboss-native deps with classifiers
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.11-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
* Tue May 21 2013 Marek Goldmann <mgoldman@redhat.com> - 1.11-1
|
||||
- Upstream release 1.11 RHBZ#962761
|
||||
- CVE-2013-2035 HawtJNI: predictable temporary file name leading to local arbitrary code execution RHBZ#962614
|
||||
|
||||
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.9-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
|
||||
|
||||
* Wed Feb 06 2013 Java SIG <java-devel@lists.fedoraproject.org> - 1.9-2
|
||||
- Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
|
||||
- Replace maven BuildRequires with maven-local
|
||||
|
||||
* Tue Oct 09 2012 Marek Goldmann <mgoldman@redhat.com> - 1.9-1
|
||||
- Upstream release 1.9, RHBZ#864490
|
||||
|
||||
* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
|
||||
|
||||
* Fri May 04 2012 Tomas Radej <tradej@redhat.com> - 1.6-3
|
||||
- Removed maven-license-plugin BR
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
* Thu Aug 25 2011 Marek Goldmann <mgoldman@redhat.com> 1.6-1
|
||||
- Upstream release 1.6
|
||||
- Spec file cleanup
|
||||
|
||||
* Fri May 27 2011 Marek Goldmann <mgoldman@redhat.com> 1.5-1
|
||||
- Initial packaging
|
||||
|
Loading…
Reference in New Issue
Block a user