From d1a9e7796319d17d0020699f9b82c730da54f1d6 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@pld-linux.org>
Date: Tue, 21 Dec 2010 17:07:25 +0000
Subject: [PATCH] - 1.596: %update_icon_cache opt-in gtk+2 dep. LP#693074

Changed files:
    rpm-build-macros.spec -> 1.281
    rpm.macros -> 1.596
---
 rpm-build-macros.spec | 4 ++--
 rpm.macros            | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec
index 5aee726..a81e6df 100644
--- 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 4d5345f..5dadd81 100644
--- 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}
 
-- 
2.44.0