rpms/bsh
7
0
Fork 0
Code Issues Pull Requests Releases Activity

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

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

Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This commit is contained in:
Ville Skyttä 2016-10-13 00:47:10 +03:00 committed by Mikolaj Izdebski
parent 7fad1b4523
commit 746caad222
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bsh.spec
View File

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