SOURCES: rpm.macros - add %update_desktop_database (the _post, _pos...

[glen]

Author: glen                         Date: Fri Mar 21 22:57:36 2008 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- add %update_desktop_database (the _post,_postun are pointless)

---- Files affected:
SOURCES:
   rpm.macros (1.444 -> 1.445) 

---- Diffs:

================================================================
Index: SOURCES/rpm.macros
diff -u SOURCES/rpm.macros:1.444 SOURCES/rpm.macros:1.445
--- SOURCES/rpm.macros:1.444	Fri Mar 21 23:40:11 2008
+++ SOURCES/rpm.macros	Fri Mar 21 23:57:30 2008
@@ -504,16 +504,16 @@
 #-----------------------------------------------------------------
 # Update desktop MIME database
 # requires: desktop-file-utils
-#
-%update_desktop_database_post() {{\
+%update_desktop_database() {{ \
 	umask 022; \
 	/usr/bin/update-desktop-database -q; \
 }}%{nil}
 
-%update_desktop_database_postun() {{\
+%update_desktop_database_post %update_desktop_database
+
+%update_desktop_database_postun() {{ \
 if [ "$1" = "0" ]; then \
-	umask 022; \
-	/usr/bin/update-desktop-database -q; \
+	%update_desktop_database; \
 fi; \
 }}%{nil}
 
@@ -521,7 +521,7 @@
 # Update shared MIME info database
 # requires: shared-mime-info
 #
-%update_mime_database() {{\
+%update_mime_database() {{ \
 	umask 022; \
 	/usr/bin/update-mime-database %{_datadir}/mime; \
 }}%{nil}
@@ -530,7 +530,7 @@
 # Update icon cache
 # requires: gtk+
 #
-%update_icon_cache() {{\
+%update_icon_cache() {{ \
 	umask 022; \
 	/usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \
 }}%{nil}
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/rpm.macros?r1=1.444&r2=1.445&f=u