osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Don't run gtk-update-icon-cache when uninstalling the Qt package. But do run 

it when installing the gnome package.

Change-Id: I0bbd9c0edc3fb6fe0e672aa3dbea5ba23d847d87
Reviewed-on: https://code.wireshark.org/review/5598
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
This commit is contained in:
Jeff Morriss 2014-12-03 17:05:00 -05:00
parent c86d1d2dd1
commit 7ef5abc818
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packaging/rpm/SPECS/wireshark.spec.in
View File

@ -289,8 +289,6 @@ touch --no-create /usr/share/icons/hicolor &>/dev/null || :
update-desktop-database &> /dev/null ||:
update-mime-database /usr/share/mime &> /dev/null || :
if [ $1 -eq 0 ] ; then
touch --no-create /usr/share/icons/hicolor &>/dev/null || :
gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
/usr/sbin/update-alternatives --remove %{name} %{_bindir}/wireshark-qt
fi
%endif
@ -300,6 +298,7 @@ fi
update-desktop-database &> /dev/null ||:
update-mime-database /usr/share/mime &> /dev/null || :
touch --no-create /usr/share/icons/hicolor &>/dev/null || :
gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
/usr/sbin/update-alternatives --install %{_bindir}/wireshark \
%{name} %{_bindir}/wireshark-gtk 10
@ -387,6 +386,10 @@ gtk-update-icon-cache /usr/share/icons/hicolor &>/dev/null || :
%endif
%changelog
* Wed Dec 3 2014 Jeff Morriss
- Don't run gtk-update-icon-cache when uninstalling the Qt package. But do run
it when installing the gnome package.
* Fri Aug 29 2014 Gerald Combs
- The Qt UI is now the default. Update logic and prioritization to
reflect this.