rpms/xkeyboard-config/devel xkeyboard-config-1.5-evdevkbds.patch, NONE, 1.1 xkeyboard-config.spec, 1.33, 1.34

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8005

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.5-evdevkbds.patch 
Log Message:
* Mon Feb 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5-2
- xkeyboard-config-1.5-evdevkbds.patch: include model-specifics when using
  evdev.



xkeyboard-config-1.5-evdevkbds.patch:

--- NEW FILE xkeyboard-config-1.5-evdevkbds.patch ---
>From e8b234d2566c1a5dcb5d41706f14a66e426c7d30 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Sun, 1 Feb 2009 15:54:12 +0000
Subject: [PATCH] introducing $evdevkbds

---
 ChangeLog             |    4 +++-
 rules/base.lists.part |    1 +
 rules/evdev.m_s.part  |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rules/base.lists.part b/rules/base.lists.part
index e1897b1..7cbd874 100644
--- a/rules/base.lists.part
+++ b/rules/base.lists.part
@@ -87,3 +87,4 @@
               vn \
               za
 
+! $evdevkbds = ibm_spacesaver
diff --git a/rules/evdev.m_s.part b/rules/evdev.m_s.part
index fd6590d..516c976 100644
--- a/rules/evdev.m_s.part
+++ b/rules/evdev.m_s.part
@@ -1 +1,2 @@
-  *     =       +inet(evdev)
+  $evdevkbds    =   +inet(evdev)+inet(%m)
+  *             =   +inet(evdev)
-- 
1.6.0.6



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- xkeyboard-config.spec	2 Feb 2009 00:37:37 -0000	1.33
+++ xkeyboard-config.spec	2 Feb 2009 00:45:34 -0000	1.34
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -16,6 +16,8 @@
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
+# Taken from upstream, remove with 1.6
+Patch6: xkeyboard-config-1.5-evdevkbds.patch
 
 BuildArch: noarch
 
@@ -97,6 +99,10 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Feb 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.5-2
+- xkeyboard-config-1.5-evdevkbds.patch: include model-specifics when using
+  evdev.
+
 * Mon Feb 02 2009 Peter Hutterer <peter.hutterer at redhat.com> 
 - purge obsolete patches.