- 1.596: %update_icon_cache opt-in gtk+2 dep. LP#693074

Changed files:
    rpm-build-macros.spec -> 1.281
    rpm.macros -> 1.596

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 5aee726f1325a8f3efd4eca007b8f05985295e80..a81e6df28365a1e19584061a04431d551b33b879 100644 (file)
--- a/rpm-build-macros.spec
+++ b/rpm-build-macros.spec
@@ -1,5 +1,5 @@
-%define                rpm_macros_rev  1.595
-%define                find_lang_rev   1.33
+%define                rpm_macros_rev  1.596
+%define                find_lang_rev   1.34
 Summary:       PLD Linux RPM build macros
 Summary(pl.UTF-8):     Makra do budowania pakietów RPM dla Linuksa PLD
 Name:          rpm-build-macros

diff --git a/rpm.macros b/rpm.macros
index 4d5345fdbd4015a6f8a29b793594a4e55f8ba217..5dadd816e1340214b4fd3dd6f95410c2a94e665d 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -744,11 +744,13 @@ fi; \
 
 #-----------------------------------------------------------------
 # Update icon cache
-# requires: gtk+
+# BuildRequires:  rpmbuild(macros) >= 1.596
+# Requires:  hicolor-icon-theme
 #
 %update_icon_cache() {{ \
+       %{!?1:%{error:%{0}: Required icon dir missing}exit 1} \
        umask 022; \
-       /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \
+       [ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1 || :; \
 };} \
 %{nil}