[xkeyboard-config/f16] Move Ungrab and ClearGrab from the default layout to option grab:break_actions (#783044)

[Peter Hutterer]

commit 50b0bd910fdf968b52577474642547f110f86c96
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 19 16:59:51 2012 +1000

    Move Ungrab and ClearGrab from the default layout to option
    grab:break_actions (#783044)

 ...rGrab-CloseGrabs-actions-behind-an-option.patch |   81 ++++++++++++++++++++
 xkeyboard-config.spec                              |    8 ++-
 2 files changed, 88 insertions(+), 1 deletions(-)
---
diff --git a/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch b/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
new file mode 100644
index 0000000..8d7f3dd
--- /dev/null
+++ b/0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
@@ -0,0 +1,81 @@
+From 613e74f58b1a7f2b7445dc07b505180587083c03 Mon Sep 17 00:00:00 2001
+From: Daniel Stone <daniel at fooishbar.org>
+Date: Thu, 19 Jan 2012 16:36:16 +1100
+Subject: [PATCH] Hide ClearGrab/CloseGrabs actions behind an option
+
+Similar to how we put the Terminate mapping behind an option rather than
+enabling it by default, put the ClearGrab/CloseGrab action handlers
+behind an option too, so we don't ship 'break my screensaver'.  Oops.
+
+Signed-off-by: Daniel Stone <daniel at fooishbar.org>
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+
+Conflicts:
+
+	compat/xfree86
+---
+ compat/xfree86      |   15 +++++++++------
+ rules/base.o_c.part |    1 +
+ rules/base.xml.in   |    6 ++++++
+ 3 files changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/compat/xfree86 b/compat/xfree86
+index e08b0db..61b36d0 100644
+--- a/compat/xfree86
++++ b/compat/xfree86
+@@ -41,12 +41,6 @@ default partial xkb_compatibility "basic"  {
+         action = SwitchScreen(Screen=12, !SameServer);
+     };
+ 
+-    interpret XF86_Ungrab {
+-        action = Private(type=0x86, data="Ungrab");
+-    };
+-    interpret XF86_ClearGrab {
+-        action = Private(type=0x86, data="ClsGrb");
+-    };
+     interpret XF86_Next_VMode {
+         action = Private(type=0x86, data="+VMode");
+     };
+@@ -54,3 +48,12 @@ default partial xkb_compatibility "basic"  {
+         action = Private(type=0x86, data="-VMode");
+     };
+ };
++
++partial xkb_compatibility "grab_break" {
++    interpret XF86_Ungrab {
++        action = Private(type=0x86, data="Ungrab");
++    };
++    interpret XF86_ClearGrab {
++        action = Private(type=0x86, data="ClsGrb");
++    };
++};
+diff --git a/rules/base.o_c.part b/rules/base.o_c.part
+index 352f8b3..b80ab6d 100644
+--- a/rules/base.o_c.part
++++ b/rules/base.o_c.part
+@@ -3,4 +3,5 @@
+   grp_led:scroll	=	+ledscroll(group_lock)
+   japan:kana_lock	=	+japan(kana_lock)
+   caps:shiftlock	=	+ledcaps(shift_lock)
++  grab:break_actions    =       +xfree86(grab_break)
+ 
+diff --git a/rules/base.xml.in b/rules/base.xml.in
+index 9f117cf..5e9fec3 100644
+--- a/rules/base.xml.in
++++ b/rules/base.xml.in
+@@ -6063,6 +6063,12 @@
+           <_description>Toggle PointerKeys with Shift + NumLock.</_description>
+         </configItem>
+       </option>
++      <option>
++        <configItem>
++          <name>grab:break_actions</name>
++          <_description>Allow breaking grabs with keyboard actions (warning: security risk)</_description>
++        </configItem>
++      </option>
+     </group>
+     <group allowMultipleSelection="true">
+       <!-- Special shortcuts for the Euro character -->
+-- 
+1.7.7.5
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index eca0a9f..951ac9a 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.3
-Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -18,7 +18,9 @@ Source2:    commitid
 %else
 Source0:    ftp://ftp.x.org/pub/individual/data/%{name}/%{name}-%{version}.tar.bz2
 %endif
+
 Patch01:    0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch
+Patch02:    0001-Hide-ClearGrab-CloseGrabs-actions-behind-an-option.patch
 
 BuildArch: noarch
 
@@ -111,6 +113,10 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Thu Jan 19 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.3-3
+- Move Ungrab and ClearGrab from the default layout to option
+  grab:break_actions (#783044)
+
 * Tue Jun 14 2011 Peter Hutterer <peter.hutterer at redhat.com> 2.3-2
 - Add 0001-Use-XSL-to-generate-man-page-from-the-rules-XML.patch, ship
   man-page