diff options
| author | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-12-03 17:05:00 -0500 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss.ws@gmail.com> | 2014-12-03 22:06:24 +0000 |
| commit | 7ef5abc818702a4699db39d183eb680bc3947eb4 (patch) | |
| tree | 8a5cb4ccb6ada056c71e30e3d5c42ad918a39417 /packaging/rpm | |
| parent | c86d1d2dd151d3348a4f1764f760bff1e667d222 (diff) | |
| download | wireshark-7ef5abc818702a4699db39d183eb680bc3947eb4.tar.gz | |
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>
Diffstat (limited to 'packaging/rpm')
| -rw-r--r-- | packaging/rpm/SPECS/wireshark.spec.in | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/packaging/rpm/SPECS/wireshark.spec.in b/packaging/rpm/SPECS/wireshark.spec.in index d6be99beb4..ab94a6c5b3 100644 --- a/packaging/rpm/SPECS/wireshark.spec.in +++ b/packaging/rpm/SPECS/wireshark.spec.in @@ -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. |