diff --git a/hicolor-icon-theme.changes b/hicolor-icon-theme.changes index 97f3715..d738fe0 100644 --- a/hicolor-icon-theme.changes +++ b/hicolor-icon-theme.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 7 17:25:40 CET 2011 - vuntz@opensuse.org + +- Update macros.hicolor after upstream GTK+ decided to use the same + name for the gtk-update-icon-cache tool in both gtk2 and gtk3: we + use alternatives to handle the two versions of the tools. This + means we can always assume that the tool name is + gtk-update-icon-cache; so no need to check for + gtk-update-icon-cache-3.0. + ------------------------------------------------------------------- Thu Oct 7 14:51:55 CEST 2010 - vuntz@opensuse.org diff --git a/macros.hicolor b/macros.hicolor index 8ac6f49..89c42c4 100644 --- a/macros.hicolor +++ b/macros.hicolor @@ -42,8 +42,6 @@ ICON_THEME="hicolor" %endif \ if test -x %{_bindir}/gtk-update-icon-cache; then \ %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ -elif test -x %{_bindir}/gtk-update-icon-cache-3.0; then \ - %{_bindir}/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ fi # On uninstall, update the icon cache. Note: we ignore upgrades (already @@ -57,7 +55,5 @@ if [ $1 -eq 0 ]; then %endif \ if test -x %{_bindir}/gtk-update-icon-cache; then \ %{_bindir}/gtk-update-icon-cache --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ - elif test -x %{_bindir}/gtk-update-icon-cache-3.0; then \ - %{_bindir}/gtk-update-icon-cache-3.0 --quiet --force "%{_datadir}/icons/${ICON_THEME}" || true \ fi \ fi