rpms/xkeyboard-config/F-10 xkeyboard-config-1.4-ara.patch, NONE, 1.1 xkeyboard-config.spec, 1.27, 1.28

[Peter Hutterer]

Author: whot

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

Modified Files:
	xkeyboard-config.spec 
Added Files:
	xkeyboard-config-1.4-ara.patch 
Log Message:
* Mon Mar 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-7
- xkeyboard-config-1.4-ara.patch: restore ara presentation forms (#466627).



xkeyboard-config-1.4-ara.patch:

--- NEW FILE xkeyboard-config-1.4-ara.patch ---
>From c3b2fd97444f47e726b7916dd1a3ce04ada2d88d Mon Sep 17 00:00:00 2001
From: Sergey V. Udaltsov <svu at gnome.org>
Date: Fri, 12 Dec 2008 12:01:40 +0000
Subject: [PATCH] restore presentation forms, b.fd.o#18833

---
 symbols/ara |    6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/symbols/ara b/symbols/ara
index a42fc69..9fa40e9 100644
--- a/symbols/ara
+++ b/symbols/ara
@@ -31,7 +31,7 @@ xkb_symbols "basic" {
     key <AD02> {  [      Arabic_sad,     Arabic_fathatan  ]     };
     key <AD03> {  [     Arabic_theh,     Arabic_damma     ]     };
     key <AD04> {  [      Arabic_qaf,     Arabic_dammatan  ]     };
-    key <AD05> {  [      Arabic_feh,       VoidSymbol     ]     };
+    key <AD05> {  [      Arabic_feh,     0x100fef9        ]     };
     key <AD06> {  [   Arabic_ghain, Arabic_hamzaunderalef ]     };
     key <AD07> {  [      Arabic_ain,         grave        ]     };
     key <AD08> {  [       Arabic_ha,        division      ]     };
@@ -44,7 +44,7 @@ xkb_symbols "basic" {
     key <AC02> {  [     Arabic_seen,   Arabic_kasratan    ]     };
     key <AC03> {  [      Arabic_yeh,       bracketright   ]     };
     key <AC04> {  [      Arabic_beh,       bracketleft    ]     };
-    key <AC05> {  [      Arabic_lam,       VoidSymbol     ]     };
+    key <AC05> {  [      Arabic_lam,       0x100fef7      ]     };
     key <AC06> {  [     Arabic_alef,   Arabic_hamzaonalef ]     };
     key <AC07> {  [      Arabic_teh,      Arabic_tatweel  ]     };
     key <AC08> {  [     Arabic_noon,      Arabic_comma    ]     };
@@ -57,7 +57,7 @@ xkb_symbols "basic" {
     key <AB02> {  [    Arabic_hamza,      Arabic_sukun    ]     };
     key <AB03> {  [Arabic_hamzaonwaw,      braceright     ]     };
     key <AB04> {  [       Arabic_ra,       braceleft      ]     };
-    key <AB05> {  [       VoidSymbol,      VoidSymbol     ]     };
+    key <AB05> {  [       0x100fefb,       0x100fef5      ]     };
     key <AB06> {  [Arabic_alefmaksura, Arabic_maddaonalef ]     };
     key <AB07> {  [Arabic_tehmarbuta,    apostrophe       ]     };
     key <AB08> {  [      Arabic_waw,         comma        ]     };
-- 
1.6.0.6



Index: xkeyboard-config.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xkeyboard-config/F-10/xkeyboard-config.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- xkeyboard-config.spec	4 Jan 2009 23:15:24 -0000	1.27
+++ xkeyboard-config.spec	1 Mar 2009 23:22:59 -0000	1.28
@@ -4,7 +4,7 @@
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
 Version: 1.4
-Release: 6%{?dist}
+Release: 7%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -21,6 +21,9 @@
 Patch5: xkeyboard-config-1.4-jp-tilde.patch
 # RH 470153, FDO Bug 18712 (fixed), taken from git
 Patch6: xkeyboard-config-1.4-abnt2.patch
+# RH 466627, FDO bug 18333 (fixed), taken from git
+Patch7: xkeyboard-config-1.4-ara.patch
+
 
 BuildArch: noarch
 
@@ -56,6 +59,7 @@
 %patch4 -p1 -b .battery
 %patch5 -p1 -b .jp-tilde
 %patch6 -p1 -b .abnt2
+%patch7 -p1 -b .ara
 
 %build
 %configure \
@@ -95,6 +99,9 @@
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Mon Mar 02 2009 Peter Hutterer <peter.hutterer at redhat.com> - 1.4-7
+- xkeyboard-config-1.4-ara.patch: restore ara presentation forms (#466627).
+
 * 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)