[xkeyboard-config] Revert broken fix for is keyboard (#826220)

[Peter Hutterer]

commit 35a54fb780523257c1e72b62b514ab47aa678f84
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jun 26 13:16:08 2012 +1000

    Revert broken fix for is keyboard (#826220)

 0001-Reverting-broken-fix-for-is-keyboard.patch |   34 +++++++++++++++++++++++
 xkeyboard-config.spec                           |   10 +++++-
 2 files changed, 42 insertions(+), 2 deletions(-)
---
diff --git a/0001-Reverting-broken-fix-for-is-keyboard.patch b/0001-Reverting-broken-fix-for-is-keyboard.patch
new file mode 100644
index 0000000..ba7f257
--- /dev/null
+++ b/0001-Reverting-broken-fix-for-is-keyboard.patch
@@ -0,0 +1,34 @@
+From cd657ccb4223f34feffd635c3299206f96a5e216 Mon Sep 17 00:00:00 2001
+From: "Sergey V. Udaltsov" <svu at gnome.org>
+Date: Fri, 1 Jun 2012 22:20:01 +0100
+Subject: [PATCH] Reverting broken fix for is keyboard
+
+https://bugs.freedesktop.org/show_bug.cgi?id=43173
+---
+ symbols/is |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/symbols/is b/symbols/is
+index f8e0ce1..e5f5d82 100644
+--- a/symbols/is
++++ b/symbols/is
+@@ -21,14 +21,14 @@ xkb_symbols "basic" {
+     key <AE12>	{ [     minus, underscore, dead_cedilla,  dead_ogonek ]	};
+ 
+     key <AD11>	{ [       eth,        ETH, dead_diaeresis, dead_abovering ] };
+-    key <AD12>	{ [apostrophe,   question,   dead_tilde,  dead_macron ]	};
++    key <AD12>	{ [apostrophe,   question,   asciitilde,  dead_macron ]	};
+ 
+     key <AC10>	{ [        ae,         AE,  asciicircum, dead_doubleacute ] };
+     key <AC11>	{ [dead_acute, dead_acute, dead_circumflex, dead_caron ] };
+     key <TLDE>	{ [dead_abovering,  dead_diaeresis,      notsign,      hyphen ]	};
+ 
+ //  <AC12> = <BKSL>
+-    key <BKSL>	{ [      plus,   asterisk,   dead_grave,   dead_breve ]	};
++    key <BKSL>	{ [      plus,   asterisk,   grave,   dead_breve ]	};
+ 
+ //  <AB00> = <LSGT>, is in file "pc": pc105
+     key <AB10>	{ [     thorn,      THORN, dead_belowdot, dead_abovedot ] };
+-- 
+1.7.10.2
+
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index 947b03d..9b9bec8 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -7,7 +7,7 @@
 Summary: X Keyboard Extension configuration data
 Name: xkeyboard-config
 Version: 2.6
-Release: 1%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
+Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.freedesktop.org/wiki/Software/XKeyboardConfig
@@ -19,6 +19,9 @@ Source2:    commitid
 Source0: http://xorg.freedesktop.org/archive/individual/data/xkeyboard-config/%{name}-%{version}.tar.bz2
 %endif
 
+# Bug 826220 - Tilda is now a dead key (for accented chars)
+Patch01: 0001-Reverting-broken-fix-for-is-keyboard.patch
+
 BuildArch: noarch
 
 BuildRequires: pkgconfig
@@ -68,7 +71,7 @@ git add .
 git commit -a -q -m "%{name} %{version} baseline."
 %endif
 
-#git am -p1 $(awk '/^Patch.*:/ { print "%{_sourcedir}/"$2 }' %{_specdir}/%{name}.spec)
+git am -p1 %{patches} < /dev/null
 
 %build
 AUTOPOINT="intltoolize --automake --copy" autoreconf -v --force --install || exit 1
@@ -109,6 +112,9 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/X11/xkb/compiled
 %{_datadir}/pkgconfig/xkeyboard-config.pc
 
 %changelog
+* Tue Jun 26 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.6-2
+- Revert broken fix for is keyboard (#826220)
+
 * Thu May 31 2012 Peter Hutterer <peter.hutterer at redhat.com> 2.6-1
 - xkeyboard-config 2.6
 - change source URL, 2.6 is in a different directory