[rpms/bsh] epel10: Switch to jline 2.x in -utils, mark License.txt as %license

[rpms/bsh] epel10: Switch to jline 2.x in -utils, mark License.txt as %license

[@ 2026-07-15 9:36 UTC (permalink / raw)]

            A new commit has been pushed.

            Repo   : rpms/bsh
            Branch : epel10
            Commit : 746caad2229a2d2740fadfc6b3f925c9dcd699d9
            Author : Ville Skyttä <ville.skytta@iki.fi>
            Date   : 2016-10-17T08:49:38+02:00
            Stats  : +11/-7 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/bsh/c/746caad2229a2d2740fadfc6b3f925c9dcd699d9?branch=epel10

            Log:
            Switch to jline 2.x in -utils, mark License.txt as %license

https://bugzilla.redhat.com/show_bug.cgi?id=1384236

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---
diff --git a/bsh.spec b/bsh.spec
index 786d51a..a1d6580 100644
--- a/bsh.spec
+++ b/bsh.spec
@@ -30,7 +30,7 @@
 
 Name:           bsh
 Version:        1.3.0
-Release:        35%{?dist}
+Release:        36%{?dist}
 Epoch:          0
 Summary:        Lightweight Scripting for Java
 License:        (SPL or LGPLv2+) and Public Domain
@@ -98,7 +98,7 @@ Demonstrations and samples for %{name}.
 %package utils
 Summary:        %{name} utilities
 Requires:       %{name} = %{epoch}:%{version}-%{release}
-Requires:       jline1
+Requires:       jline
 Provides:       %{name}-desktop = %{epoch}:%{version}-%{release}
 
 %description utils
@@ -197,7 +197,7 @@ install -m 644 dist/bshservlet-wbsh.war $RPM_BUILD_ROOT%{_datadir}/%{name}/webap
 # scripts
 install -d $RPM_BUILD_ROOT%{_bindir}
 
-%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true
+%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.console.internal.ConsoleRunner %{name}:jline %{name} true
 %jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true
 
 cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF
@@ -218,18 +218,18 @@ fi
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f .mfiles
-%doc src/License.txt
+%license src/License.txt
 %doc src/Changes.html src/README.txt
 %{_javadir}/*
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/webapps
 
 %files manual
-%doc src/License.txt
+%license src/License.txt
 %doc docs/*
 
 %files javadoc
-%doc src/License.txt
+%license src/License.txt
 %{_javadocdir}/%{name}
 
 %files demo
@@ -242,6 +242,10 @@ fi
 %{_datadir}/icons/hicolor/*x*/apps/%{name}.png
 
 %changelog
+* Wed Oct 12 2016 Ville Skyttä <ville.skytta@iki.fi> - 0:1.3.0-36
+- Switch to jline 2.x in -utils
+- Mark License.txt as %%license
+
 * Thu Jul 21 2016 Michael Simacek <msimacek@redhat.com> - 0:1.3.0-35
 - Replace perl usage with sed
 
@@ -408,7 +412,7 @@ fi
 - remove bsf patch (fixed upstream)
 - add epoch to demo package Requires
 
-* Fri Apr 12 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.4jpp
+* Sat Apr 12 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.4jpp
 - fix strange permissions
 
 * Fri Apr 11 2003 David Walluck <david@anti-microsoft.org> 0:1.2-0.b8.3jpp