rpms/pidgin/FC-6 pidgin.spec,1.12,1.13

[Stu Tomlinson (nosnilmot)]

Author: nosnilmot

Update of /cvs/extras/rpms/pidgin/FC-6
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3121

Modified Files:
	pidgin.spec 
Log Message:
Bring FC-6 Pidgin up to the same level as F7/devel



Index: pidgin.spec
===================================================================
RCS file: /cvs/extras/rpms/pidgin/FC-6/pidgin.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- pidgin.spec	5 May 2007 04:32:27 -0000	1.12
+++ pidgin.spec	7 May 2007 01:36:00 -0000	1.13
@@ -21,13 +21,13 @@
 # OPTION: dbus-glib split (FC6+)
 %define dbus_glib_splt		1
 # OPTION: Meanwhile integration (F7+)
-%define meanwhile_integration	1
+%define meanwhile_integration	0
 # OPTION: Perl devel separated out (F7+)
-%define perl_devel_separated    1
+%define perl_devel_separated    0
 
 Name:		pidgin
 Version:	2.0.0
-Release:	1.1%{?dist}
+Release:	2%{?dist}
 License:	GPL
 Group:		Applications/Internet
 URL:		http://pidgin.im/
@@ -325,7 +325,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
 
 %post
@@ -334,7 +334,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 || :
 
 %post -n libpurple -p /sbin/ldconfig
 
@@ -345,7 +345,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
@@ -429,6 +429,9 @@
 
 
 %changelog
+* Sun May 6 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.0-2
+- Silence errors when gconfd-2 is not running
+
 * Sat May 5 2007 Stu Tomlinson <stu at nosnilmot.com> - 2.0.0-1.1
 - Add perl-devel to BuildRequires