[gnome-settings-daemon/f16] 3.1.5

[Matthias Clasen]

commit 876a5c156909694a86207526d755f95ef9178e6f
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Tue Aug 16 15:05:56 2011 -0400

    3.1.5

 .gitignore                 |    1 +
 gnome-settings-daemon.spec |    9 +++++----
 sources                    |    2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ae31cbd..9f0cb75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ gnome-settings-daemon-2.31.6.tar.bz2
 /gnome-settings-daemon-3.1.2.tar.xz
 /gnome-settings-daemon-3.1.3.tar.xz
 /gnome-settings-daemon-3.1.4.tar.xz
+/gnome-settings-daemon-3.1.5.tar.xz
diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index c6e1521..e1c0b7f 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,6 +1,6 @@
 Name:           gnome-settings-daemon
-Version:        3.1.4
-Release:        5%{?dist}
+Version:        3.1.5
+Release:        1%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -14,7 +14,6 @@ Source:         http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}
 Patch0:         chrony-support.patch
 
 Patch1:         fallback-mounter.patch
-Patch2:         0001-wacom-invert-TPCButton-setting.patch
 
 # upstream fix
 Patch3:         0001-color-don-t-use-uninitialized-GErrors.patch
@@ -70,7 +69,6 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .chrony
 %patch1 -p1 -b .fallback
-%patch2 -p1 -b .wacom-invert-tpcbutton
 %patch3 -p1 -b .color-crash
 
 # autoreconf -i -f
@@ -239,6 +237,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-settings-daemon-3.0/input-device-example.sh
 
 %changelog
+* Tue Aug 16 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
 * Tue Aug 16 2011 Matthias Clasen <mclasen at redhat.com> - 3.1.4-5
 - Fix a crash a startup (#728903)
 
diff --git a/sources b/sources
index 37cc280..0986f15 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c95910376e4310afa497cdc33dc09ae0  gnome-settings-daemon-3.1.4.tar.xz
+3a742a30be701d8148b62332db43f5a0  gnome-settings-daemon-3.1.5.tar.xz