Update to upstream version 2.4.1

This commit is contained in:
Mikolaj Izdebski 2024-02-01 09:59:16 +01:00
parent 0067bcd523
commit be3cca233f
4 changed files with 12 additions and 17 deletions

1
.gitignore vendored
View File

@ -11,3 +11,4 @@
/jansi-2.1.1.tar.gz
/jansi-2.3.3.tar.gz
/jansi-2.4.0.tar.gz
/jansi-2.4.1.tar.gz

View File

@ -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

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap
Name: jansi
Version: 2.4.0
Release: 12%{?dist}
Version: 2.4.1
Release: 1%{?dist}
Summary: Generate and interpret ANSI escape sequences in Java
License: Apache-2.0
URL: http://fusesource.github.io/jansi/
@ -23,9 +23,10 @@ BuildRequires: javapackages-bootstrap
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
@ -51,22 +52,12 @@ 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 %{java_home}/include/jni.h src/main/native/inc_linux
ln -s %{java_home}/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
@ -104,6 +95,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_prefix}/lib/%{name}
%license license.txt
%changelog
* 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

View File

@ -1 +1 @@
SHA512 (jansi-2.4.0.tar.gz) = b52fbd371acbf98398c3720225f32c826b545cd598fdf0c327c477b416af11af3c78833998823e1e7aa92b91a31e2918d63f4a598618bbe2278c812b94217a12
SHA512 (jansi-2.4.1.tar.gz) = 5b3627e18ac6932df034f94e2090c3ec1d713879c61672fc16bd22603da3ddeadf59e9124fea3406c6abb8c90df1b64a2f460ec4f713d142f14261783b34938a