.gitignore

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

.jansi.metadata

@@ -1 +1 @@
-8f825fc9e4eafb656d1e0f01c68be9b41a750a1c SOURCES/jansi-2.3.3.tar.gz
+0e20279ed07d4b6eb8a89baa0202760f444d9b3f SOURCES/jansi-2.4.1.tar.gz

SOURCES/0001-Avoid-NPE.patch

@@ -1,26 +0,0 @@
-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/generate-tarball.sh

@@ -13,7 +13,7 @@ pushd tarball-tmp
 tar xf "../${name}-${version}.orig.tar.gz"
 
 # CLEAN TARBALL
-rm -r */src/main/native/inc_{mac,win}/
+rm -r */src/main/resources/org/fusesource/jansi/internal/native/*
 
 tar -czf "../${name}-${version}.tar.gz" *
 popd

SOURCES/jansi-jni.patch

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

SPECS/jansi.spec

@@ -1,13 +1,12 @@
 %bcond_with bootstrap
 
 Name:             jansi
-Version:          2.3.3
-Release:          7%{?dist}
+Version:          2.4.1
+Release:          3%{?dist}
 Summary:          Generate and interpret ANSI escape sequences in Java
-License:          ASL 2.0
+License:          Apache-2.0
 URL:              http://fusesource.github.io/jansi/
-
-ExclusiveArch:    aarch64 ppc64le s390x x86_64
+ExclusiveArch:    %{java_arches}
 
 # ./generate-tarball.sh
 Source0:          %{name}-%{version}.tar.gz
@@ -17,18 +16,17 @@ 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)
 BuildRequires:    mvn(org.fusesource:fusesource-pom:pom:)
-BuildRequires:    mvn(org.junit.jupiter:junit-jupiter-engine)
+BuildRequires:    mvn(org.junit.jupiter:junit-jupiter)
+BuildRequires:    mvn(org.junit.jupiter:junit-jupiter-params)
+BuildRequires:    mvn(org.moditect:moditect-maven-plugin)
 %endif
 
 %description
@@ -38,6 +36,7 @@ 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
@@ -53,30 +52,21 @@ This package contains the API documentation for %{name}.
 %pom_remove_plugin :maven-gpg-plugin
 %pom_remove_plugin :maven-javadoc-plugin
 %pom_remove_plugin :nexus-staging-maven-plugin
+%pom_remove_plugin :spotless-maven-plugin
 
 # We don't want GraalVM support in Fedora
 %pom_remove_plugin :exec-maven-plugin
 %pom_remove_dep :picocli-codegen
 
-# Build for JDK 1.8 at a minimum
-%pom_xpath_set "//pom:properties/pom:jdkTarget" 1.8
-
-# Remove prebuilt shared objects
-rm -fr src/main/resources/org/fusesource/jansi/internal
-
-# Unbundle the JNI headers
-rm src/main/native/inc_linux/*.h
-ln -s %{_jvmdir}/java-11-openjdk/include/jni.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,' \
     src/main/java/org/fusesource/jansi/internal/JansiLoader.java
 
 %build
 %set_build_flags
+CC="${CC:-gcc}"
 # Build the native artifact
-CFLAGS="$CFLAGS -I. -I%{_jvmdir}/java-11-openjdk/include -I%{_jvmdir}/java-11-openjdk/include/linux -fPIC -fvisibility=hidden"
+CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
 cd src/main/native
 $CC $CFLAGS -c jansi.c
 $CC $CFLAGS -c jansi_isatty.c
@@ -105,38 +95,64 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name}
 %license license.txt
 
 %changelog
-* Wed Nov 20 2024 Marián Konček <mkoncek@redhat.com> - 2.3.3-7
-- Rebuild with regenerated Requires on Java
+* Thu Aug 01 2024 Troy Dawson <tdawson@redhat.com> - 2.4.1-3
+- Bump release for Aug 2024 java mass rebuild
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 2.4.1-2
+- Bump release for June 2024 mass rebuild
+
+* Thu Feb 01 2024 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.1-1
+- Update to upstream version 2.4.1
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sat Jan 20 2024 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-10
+- Rebuild to regenerate auto-Requires on java
 
-* Mon Jan 30 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.3.3-6
-- Rebuild to regenerate auto-requires
+* Fri Sep 01 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.4.0-9
+- Convert License tag to SPDX format
 
-* Thu Aug 19 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-5
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.4.0-6
+- 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
 
-* Wed Aug 18 2021 Marian Koncek <mkoncek@redhat.com> - 2.3.3-4
-- 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
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
 * 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-7
+* Fri Jun 18 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-5
 - Clean tarball from content with questionable licensing
-- 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
+- Resolves: rhbz#1973738
 
 * Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 2.1.1-4
 - Bootstrap build