rpms/xkeyboard-config/F-10 xkeyboard-config-1.4-abnt2.patch, NONE, 1.1 xkeyboard-config.spec, 1.26, 1.27

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xkeyboard-config/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27763

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-abnt2.patch 
Log Message:
* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-6
- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)



xkeyboard-config-1.4-abnt2.patch:

--- NEW FILE xkeyboard-config-1.4-abnt2.patch ---
>From b67326a9b271332c5bef23115d9c4ac7e7b2e6d9 Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Wed, 26 Nov 2008 23:19:41 +0000
Subject: [PATCH] fixed abnt2 keycodes, b.fd.o#18712

---
 ChangeLog      |    5 +++++
 keycodes/evdev |    1 +
 2 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/keycodes/evdev b/keycodes/evdev
index 760e2d0..9da2cd5 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -311,6 +311,7 @@ xkb_keycodes "jp106" {
 // For brazilian ABNT2 keyboard.
 xkb_keycodes "abnt2" {
     include "evdev(evdev)"
+    <KPPT> = 129;
 };
 
 // PC98
-- 
1.6.0.6



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- xkeyboard-config.spec	12 Nov 2008 23:33:43 -0000	1.26
+++ xkeyboard-config.spec	4 Jan 2009 23:15:24 -0000	1.27
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -19,6 +19,8 @@
 Patch4: xkeyboard-config-1.4-battery.patch
 # Sent to svu
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
+# RH 470153, FDO Bug 18712 (fixed), taken from git
+Patch6: xkeyboard-config-1.4-abnt2.patch
 
 BuildArch: noarch
 
@@ -53,6 +55,7 @@
 %patch3 -p1 -b .tj-variants
 %patch4 -p1 -b .battery
 %patch5 -p1 -b .jp-tilde
+%patch6 -p1 -b .abnt2
 
 %build
 %configure \
@@ -92,6 +95,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Jan 05 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-6
+- xkeyboard-config-1.4-abnt2.patch: fix , and . mixup in abnt2 (#470153)
+
 * Tue Nov 13 2008 Peter Hutterer  <peter.hutterer at redhat.com> - 1.4-5
 - xkeyboard-config-1.4-jp-tilde.patch: TLDE in jp is Zenkaku/Hankaku, and BKSL
   should be bracket right/brace right (#469537).