[control-center/f18] Add Wacom OSD window from upstream bug #683567

[ofourdan]

commit b251d261235cf4cf13a7174b906fb7c4fa85fed2
Author: Olivier Fourdan <ofourdan at redhat.com>
Date:   Fri Oct 5 19:40:23 2012 +0200

    Add Wacom OSD window from upstream bug #683567

 ...d-show-help-window-to-the-list-of-actions.patch |   30 ++++++++++++++++++++
 control-center.spec                                |   10 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-wacom-Add-show-help-window-to-the-list-of-actions.patch b/0001-wacom-Add-show-help-window-to-the-list-of-actions.patch
new file mode 100644
index 0000000..a59056f
--- /dev/null
+++ b/0001-wacom-Add-show-help-window-to-the-list-of-actions.patch
@@ -0,0 +1,30 @@
+From a1090ffafad98f0953cb906d62619ebbe3a21676 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan at redhat.com>
+Date: Fri, 7 Sep 2012 13:52:08 +0200
+Subject: [PATCH] wacom: Add show help window to the list of actions
+
+for pad buttons, once the OSD window patch is
+merged in gnome-settings-daemon.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=683567
+---
+ panels/wacom/cc-wacom-page.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
+index d2a211a..ddaafa6 100644
+--- a/panels/wacom/cc-wacom-page.c
++++ b/panels/wacom/cc-wacom-page.c
+@@ -117,7 +117,8 @@ static struct {
+ } action_table[] = {
+        { GSD_WACOM_ACTION_TYPE_NONE,           NC_("Wacom action-type", "None")                },
+        { GSD_WACOM_ACTION_TYPE_CUSTOM,         NC_("Wacom action-type", "Send Keystroke")      },
+-       { GSD_WACOM_ACTION_TYPE_SWITCH_MONITOR, NC_("Wacom action-type", "Switch Monitor")      }
++       { GSD_WACOM_ACTION_TYPE_SWITCH_MONITOR, NC_("Wacom action-type", "Switch Monitor")      },
++       { GSD_WACOM_ACTION_TYPE_HELP,           NC_("Wacom action-type", "Show On-Screen Help") }
+ };
+ 
+ #define WACOM_C(x) g_dpgettext2(NULL, "Wacom action-type", x)
+-- 
+1.7.12.1
+
diff --git a/control-center.spec b/control-center.spec
index ddb92b0..df92cdd 100644
--- a/control-center.spec
+++ b/control-center.spec
@@ -17,13 +17,17 @@
 Summary: Utilities to configure the GNOME desktop
 Name: control-center
 Version: 3.6.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+ and GFDL
 #VCS: git:git://git.gnome.org/gnome-control-center
 Source: http://download.gnome.org/sources/gnome-control-center/3.5/gnome-control-center-%{version}.tar.xz
 URL: http://www.gnome.org
 
+# Wacom OSD window
+# https://bugzilla.gnome.org/show_bug.cgi?id=683567
+Patch1: 0001-wacom-Add-show-help-window-to-the-list-of-actions.patch
+
 Requires: gnome-settings-daemon >= 2.21.91-3
 Requires: redhat-menus >= %{redhat_menus_version}
 Requires: gnome-icon-theme
@@ -128,6 +132,7 @@ utilities.
 
 %prep
 %setup -q -n gnome-control-center-%{version}
+%patch1 -p1 -b .wacom-osd-window
 
 %build
 %configure \
@@ -245,6 +250,9 @@ fi
 
 
 %changelog
+* Fri Oct  5 2012 Olivier Fourdan <ofourdan at redhat.com> - 1:3.6.0-2
+- Add Wacom OSD window from upstream bug #683567
+
 * Tue Sep 25 2012 Richard Hughes <hughsient at gmail.com> - 1:3.6.0-1
 - Update to 3.6.0