rpms/xkeyboard-config/devel usinet.patch, NONE, 1.1 xkeyboard-config.spec, 1.16, 1.17

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/xkeyboard-config/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26719

Modified Files:
	xkeyboard-config.spec 
Added Files:
	usinet.patch 
Log Message:
Make pc105 have inet keys, not 100% correct, but better than
having the kbd driver report "us+inet" which confused XKB and
higher layers (#441398)


usinet.patch:

--- NEW FILE usinet.patch ---
diff -up xkeyboard-config-1.2/rules/base.lists.part.usinet xkeyboard-config-1.2/rules/base.lists.part
--- xkeyboard-config-1.2/rules/base.lists.part.usinet	2008-04-08 14:34:57.000000000 -0400
+++ xkeyboard-config-1.2/rules/base.lists.part	2008-04-08 14:35:26.000000000 -0400
@@ -52,6 +52,7 @@
               microsoftoffice microsoftmult \
               mx1998 mx2500 mx2750 \
               oretec \
+              pc105 \
               presario propeller \
               qtronix \
               rapidaccess rapidaccess2 rapidaccess2a thinkpad thinkpad60 \
diff -up xkeyboard-config-1.2/symbols/inet.usinet xkeyboard-config-1.2/symbols/inet
--- xkeyboard-config-1.2/symbols/inet.usinet	2008-04-09 00:08:22.000000000 -0400
+++ xkeyboard-config-1.2/symbols/inet	2008-04-09 00:09:49.000000000 -0400
@@ -2211,3 +2211,9 @@ xkb_symbols "classmate" {
     key <I30>   {       [ XF86AudioRaiseVolume  ] };
 };
 
+
+// Generic
+partial alphanumeric_keys
+xkb_symbols "pc105" {
+    include "inet(media_common)"
+};


Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/extras/rpms/xkeyboard-config/devel/xkeyboard-config.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- xkeyboard-config.spec	7 Feb 2008 17:36:24 -0000	1.16
+++ xkeyboard-config.spec	9 Apr 2008 15:21:04 -0000	1.17
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -12,6 +12,7 @@
 
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
+Patch2: usinet.patch
 
 BuildArch: noarch
 
@@ -41,6 +42,7 @@
 %prep
 %setup -q
 %patch1 -p1 -b .kzgroup
+%patch2 -p1 -b .usinet
 
 %build
 %configure \
@@ -80,6 +82,11 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed Apr  9 2008 Matthias Clasen  <mclasen at redhat.com> - 1.2-2
+- Make pc105 have inet keys, not 100% correct, but better than
+  having the kbd driver report "us+inet" which confused XKB and
+  higher layers (#441398)
+
 * Thu Feb  7 2008 Matthias Clasen  <mclasen at redhat.com> - 1.2-1
 - Update to 1.2
 - Remove upstreamed olpc patches