[gnome-settings-daemon] Update to 3.2.1

[Bastien Nocera]

commit ae8edd7bd649e83e494174d8cb7f02d28fd0931d
Author: Bastien Nocera <hadess at hadess.net>
Date:   Mon Oct 17 16:49:48 2011 +0100

    Update to 3.2.1
    
    Conflicts:
    
    	gnome-settings-daemon-3.2.0-dont_restore_brightness.patch
    	gnome-settings-daemon-3.2.0-idle_brightness_revert.patch
    	gnome-settings-daemon.spec

 .gitignore                                         |    1 +
 chrony-support.patch                               |   84 --------------------
 ...ings-daemon-3.2.0-dont_restore_brightness.patch |   50 ------------
 gnome-settings-daemon-3.2.0-dpms_on.patch          |   39 ---------
 ...tings-daemon-3.2.0-idle_brightness_revert.patch |   29 -------
 gnome-settings-daemon-3.2.0-no_default_sleep.patch |   41 ----------
 gnome-settings-daemon.spec                         |   17 +---
 sources                                            |    2 +-
 8 files changed, 7 insertions(+), 256 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 76bb7b6..ea3112b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,3 +27,4 @@ gnome-settings-daemon-2.31.6.tar.bz2
 /gnome-settings-daemon-3.1.91.tar.xz
 /gnome-settings-daemon-3.1.92.tar.xz
 /gnome-settings-daemon-3.2.0.tar.xz
+/gnome-settings-daemon-3.2.1.tar.xz
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index bf1eaf9..c9eaab8 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
-Version:        3.2.0
-Release:        2%{?dist}
+Version:        3.2.1
+Release:        1%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -9,12 +9,6 @@ URL:            http://download.gnome.org/sources/%{name}
 #VCS: git:git://git.gnome.org/gnome-settings-daemon
 Source:         http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz
 
-# These are all 3.2.1 backports to be dropped when building 3.2.1
-Patch0:		gnome-settings-daemon-3.2.0-dont_restore_brightness.patch
-Patch1:		gnome-settings-daemon-3.2.0-idle_brightness_revert.patch
-Patch2:		gnome-settings-daemon-3.2.0-no_default_sleep.patch
-Patch3:		gnome-settings-daemon-3.2.0-dpms_on.patch
-
 Requires(pre):    GConf2 >= 2.14
 Requires(preun):  GConf2 >= 2.14
 Requires(post):   GConf2 >= 2.14
@@ -64,10 +58,6 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 # autoreconf -i -f
 
@@ -223,6 +213,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Mon Oct 17 2011 Bastien Nocera <bnocera at redhat.com> 3.2.1-1
+- Update to 3.2.1
+
 * Wed Oct 12 2011 Adam Williamson <awilliam at redhat.com> - 3.2.0-2
 - backport some greatest hits from git to stop the same bugs being
   reported over and over (all will be in 3.2.1)
diff --git a/sources b/sources
index cdbb894..598f400 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-418c880430529c91e0503c22c8db8774  gnome-settings-daemon-3.2.0.tar.xz
+a410fc235418ac74c5a79cb0fd5a3199  gnome-settings-daemon-3.2.1.tar.xz