From 2b6330920d36de7c70ddb48a5d12dea53a094a13 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Mon, 3 Mar 2008 21:34:33 +0000 Subject: [PATCH] - make those gnome macros termnated in shell syntax Changed files: rpm.macros -> 1.437 --- rpm.macros | 28 ++++++++++++---------------- 1 file changed, 12 insertions(+), 16 deletions(-) diff --git a/rpm.macros b/rpm.macros index acd9432..3672685 100644 --- a/rpm.macros +++ b/rpm.macros @@ -494,52 +494,48 @@ fi; }; __spec_install_post_chrpath } } } # %gconf_schema_install() \ umask 022; \ - GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null \ - %{nil} + GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" /usr/bin/gconftool-2 --makefile-install-rule /etc/gconf/schemas/%{?1}%{!?1:*.schemas} > /dev/null; \ +%{nil} %gconf_schema_uninstall() \ if [ $1 = 0 ]; then \ umask 022; \ GCONF_CONFIG_SOURCE="xml:readwrite:/etc/gconf/gconf.xml.defaults" /usr/bin/gconftool-2 --makefile-uninstall-rule /etc/gconf/schemas/%{?1} > /dev/null \ -fi \ +fi; \ %{nil} #----------------------------------------------------------------- # Update desktop MIME database # requires: desktop-file-utils # -%update_desktop_database_post() {{ \ +%update_desktop_database_post() \ umask 022; \ /usr/bin/update-desktop-database -q; \ -}} \ %{nil} -%update_desktop_database_postun() {{ \ -if [ $1 = 0 ]; then \ +%update_desktop_database_postun() \ +if [ "$1" = "0" ]; then \ umask 022; \ /usr/bin/update-desktop-database -q; \ -fi \ -}} \ +fi; \ %{nil} #----------------------------------------------------------------- # 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} #----------------------------------------------------------------- # Update icon cache # requires: gtk+ # -%update_icon_cache() {{ \ +%update_icon_cache() \ umask 022; \ /usr/bin/gtk-update-icon-cache -qf %{_datadir}/icons/%1; \ -}} \ %{nil} #----------------------------------------------------------------- @@ -548,12 +544,12 @@ fi \ # %scrollkeeper_update_post() \ /usr/bin/scrollkeeper-update -q; \ - %{nil} +%{nil} %scrollkeeper_update_postun() \ -if [ $1 = 0 ]; then \ +if [ "$1" = "0" ]; then \ /usr/bin/scrollkeeper-update -q; \ -fi \ +fi; \ %{nil} #----------------------------------------------------------------- -- 2.43.0