packages: rpm-build-macros/rpm-build-macros.spec, rpm-build-macros/rpm.macr...

[glen]

Author: glen                         Date: Tue Dec 21 17:07:30 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- 1.596: %update_icon_cache opt-in gtk+2 dep. LP#693074

---- Files affected:
packages/rpm-build-macros:
   rpm-build-macros.spec (1.280 -> 1.281) , rpm.macros (1.595 -> 1.596) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm-build-macros.spec
diff -u packages/rpm-build-macros/rpm-build-macros.spec:1.280 packages/rpm-build-macros/rpm-build-macros.spec:1.281
--- packages/rpm-build-macros/rpm-build-macros.spec:1.280	Mon Dec 13 22:57:25 2010
+++ packages/rpm-build-macros/rpm-build-macros.spec	Tue Dec 21 18:07:25 2010
@@ -1,6 +1,6 @@
 # $Revision$, $Date$
-%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
@@ -90,6 +90,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.281  2010/12/21 17:07:25  glen
+- 1.596: %update_icon_cache opt-in gtk+2 dep. LP#693074
+
 Revision 1.280  2010/12/13 21:57:25  glen
 - 1.595: add %banner -o (once) support
 

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.595 packages/rpm-build-macros/rpm.macros:1.596
--- packages/rpm-build-macros/rpm.macros:1.595	Mon Dec 13 22:57:25 2010
+++ packages/rpm-build-macros/rpm.macros	Tue Dec 21 18:07:25 2010
@@ -744,11 +744,13 @@
 
 #-----------------------------------------------------------------
 # 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}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm-build-macros.spec?r1=1.280&r2=1.281&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.595&r2=1.596&f=u