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/bsh.git#32b8f1e101180e6f1eb65e6a3c3a322bb2cf98d4
This commit is contained in:
DistroBaker 2021-01-11 23:19:51 +00:00
parent 996286cd02
commit f13a46775b
1 changed files with 6 additions and 3 deletions

View File

@ -33,7 +33,7 @@
Name: bsh Name: bsh
Version: 2.0 Version: 2.0
Release: 19.%{reltag}%{?dist} Release: 20.%{reltag}%{?dist}
Epoch: 0 Epoch: 0
Summary: Lightweight Scripting for Java Summary: Lightweight Scripting for Java
URL: http://www.beanshell.org/ URL: http://www.beanshell.org/
@ -67,7 +67,7 @@ BuildRequires: desktop-file-utils
Requires: java-headless Requires: java-headless
Requires: bsf Requires: bsf
Requires: jline Requires: jline2
# Explicit javapackages-tools requires since scripts use # Explicit javapackages-tools requires since scripts use
# /usr/share/java-utils/java-functions # /usr/share/java-utils/java-functions
Requires: javapackages-tools Requires: javapackages-tools
@ -152,7 +152,7 @@ install -m 644 dist/bshservlet-wbsh.war %{buildroot}%{_datadir}/%{name}/webapps
# scripts # scripts
install -d %{buildroot}%{_bindir} install -d %{buildroot}%{_bindir}
%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true %jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline2/jline %{name} true
%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" bsh bsh-console true %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" bsh bsh-console true
echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc
@ -178,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc
%license LICENSE NOTICE %license LICENSE NOTICE
%changelog %changelog
* Mon Dec 14 2020 Jerry James <loganjerry@gmail.com> - 0:2.0-20.b6
- Change jline Requires to jline2
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-19.b6 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0:2.0-19.b6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild