Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/jansi.git#db2bae716e7d2e2967d8bcb2afd16b535d836d6a
This commit is contained in:
DistroBaker 2021-01-14 17:57:30 +00:00
parent f832155f15
commit b0b33e3069

View File

@ -1,6 +1,6 @@
Name: jansi Name: jansi
Version: 2.1.1 Version: 2.1.1
Release: 1%{?dist} Release: 2%{?dist}
Summary: Generate and interpret ANSI escape sequences in Java Summary: Generate and interpret ANSI escape sequences in Java
License: ASL 2.0 License: ASL 2.0
@ -61,14 +61,15 @@ sed -i 's,@LIBDIR@,%{libdir},' \
src/main/java/org/fusesource/jansi/internal/JansiLoader.java src/main/java/org/fusesource/jansi/internal/JansiLoader.java
%build %build
%set_build_flags
# Build the native artifact # Build the native artifact
CFLAGS="%{build_cflags} -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden" CFLAGS="$CFLAGS -I. -I%{java_home}/include -I%{java_home}/include/linux -fPIC -fvisibility=hidden"
cd src/main/native cd src/main/native
gcc $CFLAGS -c jansi.c $CC $CFLAGS -c jansi.c
gcc $CFLAGS -c jansi_isatty.c $CC $CFLAGS -c jansi_isatty.c
gcc $CFLAGS -c jansi_structs.c $CC $CFLAGS -c jansi_structs.c
gcc $CFLAGS -c jansi_ttyname.c $CC $CFLAGS -c jansi_ttyname.c
gcc $CFLAGS %{build_ldflags} -shared -o libjansi.so *.o -lutil $CC $CFLAGS $LDFLAGS -shared -o libjansi.so *.o -lutil
cd - cd -
# Build the Java artifacts # Build the Java artifacts
@ -91,6 +92,9 @@ cp -p src/main/native/libjansi.so %{buildroot}%{_libdir}/%{name}
%license license.txt %license license.txt
%changelog %changelog
* Thu Jan 14 2021 Timm Bäder <tbaeder@redhat.com> - 2.1.1-2
- Use standard variables when compiling native artifact
* Tue Dec 15 2020 Jerry James <loganjerry@gmail.com> - 2.1.1-1 * Tue Dec 15 2020 Jerry James <loganjerry@gmail.com> - 2.1.1-1
- Version 2.1.1 - Version 2.1.1
- Remove package name from Summary - Remove package name from Summary