rpms/xorg-x11-server/F-10 10-x11-keymap.fdi, 1.1, 1.2 xorg-x11-server.spec, 1.389, 1.390

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-server/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27787

Modified Files:
	10-x11-keymap.fdi xorg-x11-server.spec 
Log Message:
* Fri Feb 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-11
- Update 10-x11-keymap.fdi: only call fedora-setup-keyboard for devices with
  input.capabilities = keyboard (#484217)




Index: 10-x11-keymap.fdi
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/10-x11-keymap.fdi,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- 10-x11-keymap.fdi	4 Aug 2008 21:15:46 -0000	1.1
+++ 10-x11-keymap.fdi	5 Feb 2009 23:06:06 -0000	1.2
@@ -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>


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-server/F-10/xorg-x11-server.spec,v
retrieving revision 1.389
retrieving revision 1.390
diff -u -r1.389 -r1.390
--- xorg-x11-server.spec	3 Feb 2009 23:34:32 -0000	1.389
+++ xorg-x11-server.spec	5 Feb 2009 23:06:06 -0000	1.390
@@ -19,7 +19,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.5.3
-Release:   10%{?dist}
+Release:   11%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -531,6 +531,10 @@
 
 
 %changelog
+* Fri Feb 06 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5.3-11
+- 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 at redhat.com> 1.5.3-10
 - xserver-1.5.3-xinerama-events.patch: Don't call UpdateSpriteForScreen if
   Xinerama is present (#473825)