From f13a46775b788482da452a147d22d41dec8191f0 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 11 Jan 2021 23:19:51 +0000 Subject: [PATCH] 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 --- bsh.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/bsh.spec b/bsh.spec index ba97523..11a112b 100644 --- a/bsh.spec +++ b/bsh.spec @@ -33,7 +33,7 @@ Name: bsh Version: 2.0 -Release: 19.%{reltag}%{?dist} +Release: 20.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -67,7 +67,7 @@ BuildRequires: desktop-file-utils Requires: java-headless Requires: bsf -Requires: jline +Requires: jline2 # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -152,7 +152,7 @@ install -m 644 dist/bshservlet-wbsh.war %{buildroot}%{_datadir}/%{name}/webapps # scripts 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 echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc @@ -178,6 +178,9 @@ cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc %license LICENSE NOTICE %changelog +* Mon Dec 14 2020 Jerry James - 0:2.0-20.b6 +- Change jline Requires to jline2 + * Mon Jul 27 2020 Fedora Release Engineering - 0:2.0-19.b6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild