packages: rpm-build-macros/rpm.macros - %update_icon_cache: touch icondir t...

glen glen at pld-linux.org
Wed Jan 5 00:08:46 CET 2011


Author: glen                         Date: Tue Jan  4 23:08:46 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- %update_icon_cache: touch icondir timestamp

---- Files affected:
packages/rpm-build-macros:
   rpm.macros (1.600 -> 1.601) 

---- Diffs:

================================================================
Index: packages/rpm-build-macros/rpm.macros
diff -u packages/rpm-build-macros/rpm.macros:1.600 packages/rpm-build-macros/rpm.macros:1.601
--- packages/rpm-build-macros/rpm.macros:1.600	Tue Jan  4 19:03:59 2011
+++ packages/rpm-build-macros/rpm.macros	Wed Jan  5 00:08:40 2011
@@ -751,9 +751,12 @@
 # Requires:  hicolor-icon-theme
 #
 %update_icon_cache() {{ \
-	%{!?1:%{error:%{0}: Required icon dir missing}exit 1} \
-	umask 022; \
-	[ -x /usr/bin/gtk-update-icon-cache ] && /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1 || :; \
+	%{!?1:%{error:%{0}: Required theme name missing}} \
+	if [ -x /usr/bin/gtk-update-icon-cache ]; then \
+		umask 022; \
+		touch --no-create %{_iconsdir}/%1; \
+		/usr/bin/gtk-update-icon-cache -qf %{_iconsdir}/%1; \
+	fi; \
 };} \
 %{nil}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm-build-macros/rpm.macros?r1=1.600&r2=1.601&f=u



More information about the pld-cvs-commit mailing list