- merged glen's update_desktop_database* update from AC-branch

Changed files:
    rpm.macros -> 1.210

diff --git a/rpm.macros b/rpm.macros
index 79a8a2125f9484ec53e4ab96c37ea5d1e6e61739..cc8687b067cedbc3460aba4babb912567301adaf 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -388,17 +388,17 @@ fi \
 # Update desktop MIME database
 # requries: desktop-file-utils
 #
-%update_desktop_database_post() \
+%update_desktop_database_post() {{\
        umask 022; \
        /usr/bin/update-desktop-database; \
-       %{nil}
+}}
 
-%update_desktop_database_postun() \
+%update_desktop_database_postun() {{\
 if [ $1 = 0 ]; then \
        umask 022; \
        /usr/bin/update-desktop-database; \
 fi \
-%{nil}
+}}
 
 #-----------------------------------------------------------------
 # Update scrollkeeper database