Mercurial > pidgin.yaz

changeset 17066:8ee93c68ced0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Add scriptlet Requires for GConf2 to fix schema installation - Silence harmless errors when gconfd-2 is not running at install time
author Stu Tomlinson <stu@nosnilmot.com>
date Sat, 12 May 2007 13:21:29 +0000
parents 21830d70709b
children 9af44da5a6b8
files pidgin.spec.in
diffstat 1 files changed, 11 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/pidgin.spec.in	Sat May 12 13:20:04 2007 +0000
+++ b/pidgin.spec.in	Sat May 12 13:21:29 2007 +0000
@@ -70,6 +70,10 @@
 # For some reason perl isn't always automatically detected as a requirement :(
 Requires: perl
 
+Requires(pre): GConf2
+Requires(post): GConf2
+Requires(preun): GConf2
+
 Obsoletes: gaim
 Provides: gaim
 
@@ -296,7 +300,7 @@
     if [ -f %{_sysconfdir}/gconf/schemas/purple.schemas ]; then
         gconftool-2 --makefile-uninstall-rule \
             %{_sysconfdir}/gconf/schemas/purple.schemas >/dev/null || :
-        killall -HUP gconfd-2 || :
+        killall -HUP gconfd-2 &> /dev/null || :
     fi
 fi
 
@@ -305,7 +309,7 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-install-rule \
         %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 touch --no-create %{_datadir}/icons/hicolor || :
 %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
@@ -319,7 +323,7 @@
     export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
     gconftool-2 --makefile-uninstall-rule \
       %{_sysconfdir}/gconf/schemas/purple.schemas > /dev/null || :
-    killall -HUP gconfd-2 || :
+    killall -HUP gconfd-2 &> /dev/null || :
 fi
 
 %postun
@@ -443,6 +447,10 @@
 %endif
 
 %changelog
+* Thu May 10 2007 Stu Tomlinson <stu@nosnilmot.com>
+- Add scriptlet Requires for GConf2 to fix schema installation
+- Silence harmless errors when gconfd-2 is not running at install time
+
 * Thu May 3 2007 Stu Tomlinson <stu@nosnilmot.com>
 - Add missing BuildRequires: startup-notification-devel, if you really
   need to build on a distro without it use --without startupnotification