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