[gnome-settings-daemon] Sync with f18

[Matthias Clasen]

commit f14d4708b4d3ef6e31acb3003f3811808b5c805c
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Thu Oct 18 22:50:18 2012 -0400

    Sync with f18

 gnome-settings-daemon.spec |   16 ++++++++--------
 sources                    |    2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index fabc238..d951694 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
-Version:        3.6.0
-Release:        7%{?dist}
+Version:        3.6.1
+Release:        2%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -11,8 +11,6 @@ Source:         http://download.gnome.org/sources/%{name}/3.6/%{name}-%{version}
 # disable wacom for ppc/ppc64 (used on RHEL)
 Patch0:         %{name}-3.5.4-ppc-no-wacom.patch
 
-# upstream cleanup
-Patch1: 0001-Clean-up-gsd_power_stop.patch
 # https://bugzilla.gnome.org/show_bug.cgi?id=680689
 Patch2: 0001-power-and-media-keys-Use-logind-for-suspending-and-r.patch
 # Wacom OSD window
@@ -82,7 +80,6 @@ The %{name}-updates package contains the updates plugin for %{name}
 %patch0 -p1 -b .ppc-no-wacom
 %endif
 
-%patch1 -p1
 %patch2 -p1
 %patch3 -p1 -b .wacom-osd-window
 
@@ -261,13 +258,16 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/interfaces/org.gnome.SettingsDaemonUpdates.xml
 
 %changelog
-* Tue Oct  8 2012 Dan Horák <dan[at]danny.cz> - 3.6.0-7
+* Tue Oct 08 2012 Dan Horák <dan[at]danny.cz> - 3.6.1-2
 - fix build on s390(x)
 
-* Fri Oct  5 2012 Olivier Fourdan <mclasen at redhat.com> - 3.6.0-6
+* Mon Oct 08 2012 Bastien Nocera <bnocera at redhat.com> 3.6.1-1
+- Update to 3.6.1
+
+* Fri Oct  5 2012 Olivier Fourdan <mclasen at redhat.com> - 3.6.0-5
 - Adds Wacom OSD window from upstream bug #679062
 
-* Wed Oct  3 2012 Matthias Clasen <mclasen at redhat.com> - 3.6.0-5
+* Wed Oct  3 2012 Matthias Clasen <mclasen at redhat.com> - 3.6.0-4
 - Fix an inhibitor leak in the previous patch
 
 * Tue Oct  2 2012 Matthias Clasen <mclasen at redhat.com> - 3.6.0-3
diff --git a/sources b/sources
index b3240c3..8b279b9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-50eb4c88f0be6b36e5f829a6a57a6ce6  gnome-settings-daemon-3.6.0.tar.xz
+27ea0c6ee61a1b3cb5d8e3e0cd10107c  gnome-settings-daemon-3.6.1.tar.xz