rpms/xorg-x11-server/devel 10-x11-keymap.fdi, 1.1, 1.2 xorg-x11-server.spec, 1.396, 1.397

[Peter Hutterer]

Author: whot

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

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.99.902-3
- 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/devel/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 22:21:20 -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/devel/xorg-x11-server.spec,v
retrieving revision 1.396
retrieving revision 1.397
diff -u -r1.396 -r1.397
--- xorg-x11-server.spec	3 Feb 2009 23:36:39 -0000	1.396
+++ xorg-x11-server.spec	5 Feb 2009 22:21:20 -0000	1.397
@@ -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 @@
 
 
 %changelog
+* Fri Feb 06 2009 Peter Hutterer <peter.hutterer at 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 at 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)