Switch to jline1 (Resolves rhbz#1023018)
This commit is contained in:
parent
cb70e69005
commit
b4c0e319a4
9
bsh.spec
9
bsh.spec
@ -30,7 +30,7 @@
|
||||
|
||||
Name: bsh
|
||||
Version: 1.3.0
|
||||
Release: 27%{?dist}
|
||||
Release: 28%{?dist}
|
||||
Epoch: 0
|
||||
Summary: Lightweight Scripting for Java
|
||||
License: (SPL or LGPLv2+) and Public Domain
|
||||
@ -95,7 +95,7 @@ Demonstrations and samples for %{name}.
|
||||
%package utils
|
||||
Summary: %{name} utilities
|
||||
Requires: %{name} = %{epoch}:%{version}-%{release}
|
||||
Requires: jline
|
||||
Requires: jline1
|
||||
Provides: %{name}-desktop = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description utils
|
||||
@ -194,7 +194,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}:jline %{name} true
|
||||
%jpackage_script bsh.Interpreter "\${BSH_DEBUG:+-Ddebug=true}" jline.ConsoleRunner %{name}:jline1/jline-1 %{name} true
|
||||
%jpackage_script bsh.Console "\${BSH_DEBUG:+-Ddebug=true}" "" %{name} %{name}-console true
|
||||
|
||||
cat > $RPM_BUILD_ROOT%{_bindir}/%{name}doc << EOF
|
||||
@ -247,6 +247,9 @@ dummy = posix.readlink(dir) and os.remove(dir)
|
||||
%{_datadir}/icons/hicolor/*x*/apps/%{name}.png
|
||||
|
||||
%changelog
|
||||
* Wed Oct 30 2013 Michal Srb <msrb@redhat.com> - 0:1.3.0-28
|
||||
- Switch to jline1 (Resolves rhbz#1023018)
|
||||
|
||||
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:1.3.0-27
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user