rpms/gnome-compiz-manager/F-8 gnome-compiz-manager.spec,1.2,1.3

[Denis Leroy (denis)]

Author: denis

Update of /cvs/pkgs/rpms/gnome-compiz-manager/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24030

Modified Files:
	gnome-compiz-manager.spec 
Log Message:
Fix duplicate desktop entries, Made gconf killall silent


Index: gnome-compiz-manager.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-compiz-manager/F-8/gnome-compiz-manager.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gnome-compiz-manager.spec	17 Oct 2007 06:25:38 -0000	1.2
+++ gnome-compiz-manager.spec	10 Dec 2007 08:05:06 -0000	1.3
@@ -1,6 +1,6 @@
 Name:           gnome-compiz-manager
 Version:        0.10.4
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Compiz configuration utility
 
 Group:          User Interface/Desktops
@@ -64,6 +64,7 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make install DESTDIR=$RPM_BUILD_ROOT
 desktop-file-install --vendor="fedora"                          \
+        --delete-original                                       \
         --dir=${RPM_BUILD_ROOT}%{_datadir}/applications         \
         $RPM_BUILD_ROOT%{_datadir}/applications/gnome-compiz-preferences.desktop
 rm $RPM_BUILD_ROOT/%{_libdir}/*.la
@@ -87,7 +88,7 @@
 # If the schema file has ever been renamed::
 #gconftool-2 --makefile-uninstall-rule \
 #  %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+killall -HUP gconfd-2 &> /dev/null || :
 fi
 
 %post 
@@ -95,14 +96,14 @@
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule \
   %{_sysconfdir}/gconf/schemas/gnome-compiz-preferences.schemas > /dev/null || :
-  killall -HUP gconfd-2 || :
+  killall -HUP gconfd-2 &> /dev/null || :
   
 %preun
 if [ "$1" -eq 0 ]; then
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-uninstall-rule \
 %{_sysconfdir}/gconf/schemas/gnome-compiz-preferences.schemas > /dev/null || :
-killall -HUP gconfd-2 || :
+killall -HUP gconfd-2 &> /dev/null || :
 fi
 
 %postun -p /sbin/ldconfig
@@ -127,6 +128,10 @@
 %{_libdir}/pkgconfig/*
 
 %changelog
+* Mon Dec 10 2007 Denis Leroy <denis at poolshark.org> - 0.10.4-3
+- Fix duplicate desktop entries
+- Made gconf killall silent
+
 * Fri Oct 12 2007 Matthias Clasen <mclasen at redhat.com> - 0.10.4-2
 - Don't ship Ubuntu branding