- add %update_desktop_database (the _post,_postun are pointless)

Changed files:
    rpm.macros -> 1.445

diff --git a/rpm.macros b/rpm.macros
index d8519c0c191dcb05774075dd819d219ce881502b..51a6c7877b593f507c5508a92edf2fad13511127 100644 (file)
--- a/rpm.macros
+++ b/rpm.macros
@@ -504,16 +504,16 @@ fi; \
 #-----------------------------------------------------------------
 # Update desktop MIME database
 # requires: desktop-file-utils
 #-----------------------------------------------------------------
 # Update desktop MIME database
 # requires: desktop-file-utils

-#
-%update_desktop_database_post() {{\
+%update_desktop_database() {{ \

        umask 022; \
        /usr/bin/update-desktop-database -q; \
 }}%{nil}
 
        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 \
 if [ "$1" = "0" ]; then \

-       umask 022; \
-       /usr/bin/update-desktop-database -q; \
+       %update_desktop_database; \

 fi; \
 }}%{nil}
 
 fi; \
 }}%{nil}
 


@@ -521,7 +521,7 @@ fi; \
 # Update shared MIME info database
 # requires: shared-mime-info
 #
 # 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}
        umask 022; \
        /usr/bin/update-mime-database %{_datadir}/mime; \
 }}%{nil}


@@ -530,7 +530,7 @@ fi; \
 # Update icon cache
 # requires: gtk+
 #
 # Update icon cache
 # requires: gtk+
 #

-%update_icon_cache() {{\
+%update_icon_cache() {{ \

        umask 022; \
        /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \
 }}%{nil}
        umask 022; \
        /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \
 }}%{nil}