.gitignore

@@ -1 +1 @@
-SOURCES/jansi-2.4.0.tar.gz
+SOURCES/jansi-2.3.3.tar.gz

.jansi.metadata

@@ -1 +1 @@
-f1a617ff40c5366878d35eadf3247e81124d989f SOURCES/jansi-2.4.0.tar.gz
+8f825fc9e4eafb656d1e0f01c68be9b41a750a1c SOURCES/jansi-2.3.3.tar.gz

SOURCES/0001-Avoid-NPE.patch

@@ -0,0 +1,26 @@
+From d94c5832e14504d44abeba47866dfa7dac5992b5 Mon Sep 17 00:00:00 2001
+From: Guillaume Nodet <gnodet@gmail.com>
+Date: Fri, 23 Jul 2021 09:22:19 +0200
+Subject: [PATCH] Avoid possible NPE, fixes #214
+
+---
+ src/main/java/org/fusesource/jansi/AnsiPrintStream.java | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+index e153c43..df6e5a6 100644
+--- a/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
++++ b/src/main/java/org/fusesource/jansi/AnsiPrintStream.java
+@@ -76,7 +76,11 @@ public void install() throws IOException {
+     }
+ 
+     public void uninstall() throws IOException {
+-        getOut().uninstall();
++        // If the system output stream has been closed, out should be null, so avoid a NPE
++        AnsiOutputStream out = getOut();
++        if (out != null) {
++            out.uninstall();
++        }
+     }
+ 
+     @Override

SOURCES/jansi-jni.patch

@@ -6,7 +6,7 @@
              }
 +        } else {
 +            if (loadNativeLibrary(new File("@LIBDIR@/jansi", jansiNativeLibraryName))) {
-+                loaded = true;
++                extracted = true;
 +                return;
 +            }
          }

SPECS/jansi.spec

@@ -1,12 +1,13 @@
 %bcond_with bootstrap
 
 Name:             jansi
-Version:          2.4.0
+Version:          2.3.3
 Release:          7%{?dist}
 Summary:          Generate and interpret ANSI escape sequences in Java
 License:          ASL 2.0
 URL:              http://fusesource.github.io/jansi/
-ExclusiveArch:    %{java_arches}
+
+ExclusiveArch:    aarch64 ppc64le s390x x86_64
 
 # ./generate-tarball.sh
 Source0:          %{name}-%{version}.tar.gz
@@ -16,11 +17,13 @@ Source1:          generate-tarball.sh
 # Change the location of the native artifact to where Fedora wants it
 Patch0:           %{name}-jni.patch
 
+Patch1:           0001-Avoid-NPE.patch
+
 BuildRequires:    gcc
+BuildRequires:    maven-local
 %if %{with bootstrap}
 BuildRequires:    javapackages-bootstrap
 %else
-BuildRequires:    maven-local
 BuildRequires:    mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:    mvn(org.apache.maven.plugins:maven-source-plugin)
 BuildRequires:    mvn(org.apache.maven.surefire:surefire-junit-platform)
@@ -35,7 +38,6 @@ 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.
 
 %package javadoc
-BuildArch:        noarch
 Summary:          Javadocs for %{name}
 
 %description javadoc
@@ -64,8 +66,8 @@ rm -fr src/main/resources/org/fusesource/jansi/internal
 
 # Unbundle the JNI headers
 rm src/main/native/inc_linux/*.h
-ln -s %{java_home}/include/jni.h src/main/native/inc_linux
+ln -s %{_jvmdir}/java-11-openjdk/include/jni.h src/main/native/inc_linux
-ln -s %{java_home}/include/linux/jni_md.h src/main/native/inc_linux
+ln -s %{_jvmdir}/java-11-openjdk/include/linux/jni_md.h src/main/native/inc_linux
 
 # Set the JNI path
 sed -i 's,@LIBDIR@,%{_prefix}/lib,' \
@@ -73,9 +75,8 @@ sed -i 's,@LIBDIR@,%{_prefix}/lib,' \
 
 %build
 %set_build_flags
-CC="${CC:-gcc}"
 # Build the native artifact
-CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
+CFLAGS="$CFLAGS -I. -I%{_jvmdir}/java-11-openjdk/include -I%{_jvmdir}/java-11-openjdk/include/linux -fPIC -fvisibility=hidden"
 cd src/main/native
 $CC $CFLAGS -c jansi.c
 $CC $CFLAGS -c jansi_isatty.c
@@ -104,43 +105,38 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name}
 %license license.txt
 
 %changelog
-* Mon Apr 08 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 2.4.0-7
+* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.3.3-7
-- Rebuilt for MSVSphere 9.4 beta
+- Rebuild with regenerated Requires on Java
 
-* Mon Feb 05 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-7
+* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.3-6
 - Rebuild to regenerate auto-requires
 
-* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-6
+* Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Mon Jul 18 2022 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-5
-- Ensure CC env variable is set during build
-
-* Thu Jul 14 2022 Marian Koncek <mkoncek@redhat.com> - 2.4.0-4
-- Make javadoc subpackage noarch
-
-* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2.4.0-3
-- Rebuilt for java-17-openjdk as system jdk
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Nov 01 2021 Marian Koncek <mkoncek@redhat.com> - 2.4.0-1
-- Update to upstream version 2.4.0
-
-* Fri Sep 24 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-3
 - Install native artifact into a fixed location
 - Related: rhbz#1994935
 
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
+* Wed Aug 18 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+- Avoid possible NullPointerException
+- Resolves: rhbz#1993889
+- Load native library from the correct location
+- Resolves: rhbz#1994935
+
+* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 2.3.3-3
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
 * Wed Jun 23 2021 Jerry James <loganjerry@gmail.com> - 2.3.3-1
 - Version 2.3.3
 
-* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5
+* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-7
 - Clean tarball from content with questionable licensing
-- Resolves: rhbz#1973738
+- Resolves: rhbz#1973750
+
+* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-6
+- Rebuild to workaround DistroBaker issue
+
+* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5
+- Bootstrap Maven for CentOS Stream 9
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-4
 - Bootstrap build