diff --git a/bsh.spec b/bsh.spec index 448d035..be29400 100644 --- a/bsh.spec +++ b/bsh.spec @@ -32,7 +32,7 @@ Name: bsh Version: 2.0 -Release: 4.%{reltag}%{?dist} +Release: 5.%{reltag}%{?dist} Epoch: 0 Summary: Lightweight Scripting for Java URL: http://www.beanshell.org/ @@ -125,9 +125,9 @@ ant test dist # menu entry desktop-file-install --mode=644 \ --dir=%{buildroot}%{_datadir}/applications %{SOURCE1} -install -d -m 755 %{buildroot}%{_datadir}/icons/hicolor/16x16/apps +install -d -m 755 %{buildroot}%{_datadir}/pixmaps convert src/bsh/util/lib/icon.gif \ - %{buildroot}%{_datadir}/icons/hicolor/16x16/apps/bsh.png + %{buildroot}%{_datadir}/pixmaps/bsh.png install -d -m 755 %{buildroot}%{_datadir}/%{name} install -d -m 755 %{buildroot}%{_datadir}/%{name}/webapps @@ -143,25 +143,12 @@ install -d %{buildroot}%{_bindir} echo '#!%{_bindir}/bsh' > %{buildroot}%{_bindir}/bshdoc cat scripts/bshdoc.bsh >> %{buildroot}%{_bindir}/bshdoc -%post -/bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - -%postun -if [ $1 -eq 0 ] ; then - /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null - /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -fi - -%posttrans -/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - - %files -f .mfiles %license LICENSE NOTICE %doc README.md src/Changes.html src/CodeMap.html docs/faq/faq.html %attr(0755,root,root) %{_bindir}/%{name}* %{_datadir}/applications/%{name}-desktop.desktop -%{_datadir}/icons/hicolor/*x*/apps/%{name}.png +%{_datadir}/pixmaps/%{name}.png %{_datadir}/%{name} %files manual @@ -174,6 +161,9 @@ fi %license LICENSE NOTICE %changelog +* Fri Mar 3 2017 Mikolaj Izdebski - 0:2.0-5.b6 +- Install desktop icon to pixmaps instead of icons + * Fri Mar 3 2017 Mikolaj Izdebski - 0:2.0-4.b6 - Fix directory ownership