From a5cb92a1c1d96959205a1144a778aba8ac8a2898 Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Feb 05 2009 22:21:20 +0000
Subject: * Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-3

- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
  input.capabilities = keyboard (#484217)

---

diff --git a/10-x11-keymap.fdi b/10-x11-keymap.fdi
index 7c1ecbb..c78f05b 100644
--- a/10-x11-keymap.fdi
+++ b/10-x11-keymap.fdi
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="ISO-8859-1"?> <!-- -*- SGML -*- -->
 <deviceinfo version="0.2">
     <device>
-	<match key="input.xkb.layout" exists="true">
+	<match key="info.capabilities" contains="input.keyboard">
 	    <append key="info.callouts.add" type="strlist">fedora-setup-keyboard</append>
 	</match>
     </device>
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 6521f94..7cc8138 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.99.902
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -496,6 +496,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Fri Feb 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-3
+- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
+  input.capabilities = keyboard (#484217)
+
 * Wed Feb 04 2009 Peter Hutterer <peter.hutterer@redhat.com> 1.5.99.902-2
 - xserver-1.5.99.902-xinerama.patch: don't update the sprite root window in
   Xinerama setups (#473825)