[xkeyboard-config/f14/master] xkeyboard-config-1.9-syntax-errors.patch: fix some more syntax errors.

[Peter Hutterer]

commit 8bc62ac201b58be7d6f73362c5886e71a9ab9829
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Oct 5 03:12:46 2010 +0200

    xkeyboard-config-1.9-syntax-errors.patch: fix some more syntax errors.

 xkeyboard-config-1.9-syntax-errors.patch |   63 ++++++++++++++++++++++++++++++
 xkeyboard-config.spec                    |    7 +++-
 2 files changed, 69 insertions(+), 1 deletions(-)
---
diff --git a/xkeyboard-config-1.9-syntax-errors.patch b/xkeyboard-config-1.9-syntax-errors.patch
new file mode 100644
index 0000000..be5a5bf
--- /dev/null
+++ b/xkeyboard-config-1.9-syntax-errors.patch
@@ -0,0 +1,63 @@
+From 393204e792de332457b1175b3831170d6970a98f Mon Sep 17 00:00:00 2001
+From: Sergey V. Udaltsov <svu at gnome.org>
+Date: Thu, 1 Jul 2010 22:22:13 +0100
+Subject: [PATCH] Fixed syntax errors in include statements
+
+Fixing https://bugs.freedesktop.org/show_bug.cgi?id=25760
+---
+ symbols/in |    4 ++--
+ symbols/lk |    2 +-
+ symbols/sy |    2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/symbols/in b/symbols/in
+index 6c86b7c..363094d 100644
+--- a/symbols/in
++++ b/symbols/in
+@@ -85,7 +85,7 @@ xkb_symbols "deva" {
+ 	key <AB10> { [ U092f, U095f, slash, question ] };
+ 
+ 	// space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
+-	include "nbsp(zwnj3zwj4)";
++	include "nbsp(zwnj3zwj4)"
+ };
+ 
+ //Name		:	Bolnagri (Combined)
+@@ -1263,7 +1263,7 @@ xkb_symbols "olpc" {
+   key <AB10> { [	U092F,	U095F ] }; // DEVANAGARI LETTER YA; DEVANAGARI LETTER YYA
+ 
+   // space, space, Zero-Width-Non-Joiner (ZWNJ), Zero-Width-Joiner (ZWJ):
+-  include "nbsp(zwnj3zwj4)";
++  include "nbsp(zwnj3zwj4)"
+ 
+   include "group(olpc)"
+ };
+diff --git a/symbols/lk b/symbols/lk
+index d07453b..332e932 100644
+--- a/symbols/lk
++++ b/symbols/lk
+@@ -74,7 +74,7 @@ xkb_symbols "sin_phonetic" {
+   key <AB10> { [ any, any, 0x0100200d, NoSymbol ] };
+ 
+   // Space
+-  include "nbsp(zwnj2nb3s)";
++  include "nbsp(zwnj2nb3s)"
+ 
+   include "level3(ralt_switch)"
+ };
+diff --git a/symbols/sy b/symbols/sy
+index 6bdba99..4d6fecc 100644
+--- a/symbols/sy
++++ b/symbols/sy
+@@ -68,7 +68,7 @@ xkb_symbols "syc" {
+     // End Alphanumeric Section
+ 
+     // Space
+-    include "nbsp(zwnj2)";
++    include "nbsp(zwnj2)"
+     
+     // Begin Modifier Mappings
+     
+-- 
+1.7.2.3
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 4457747..79a50a4 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -4,7 +4,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 1.9
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -14,6 +14,8 @@ Source0: ftp://ftp.x.org/pub/individual/data/%{name}/%{name}-%{version}.tar.bz2
 Patch01: xkeyboard-config-1.9-ir-syntax-errors.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=638244
 Patch02: xkeyboard-config-1.9-unicode-mappings.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=634814
+Patch03: xkeyboard-config-1.9-syntax-errors.patch
 
 BuildArch: noarch
 
@@ -89,6 +91,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Tue Oct 05 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.9-3
+- xkeyboard-config-1.9-syntax-errors.patch: fix some more syntax errors.
+
 * Sat Oct 02 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.9-2
 - xkeyboard-config-1.9-ir-syntax-errors.patch: fix syntax errors in
   symbols/ir