From 0cf6ce6baf9866cd9e7463b5c5a877867d3fc4f2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Wed, 1 Oct 2008 16:51:06 +0000
Subject: [PATCH] 1.4

---
 .cvsignore            |  2 +-
 sources               |  2 +-
 xkeyboard-config.spec | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4d46055..63167d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xkeyboard-config-1.3.tar.bz2
+xkeyboard-config-1.4.tar.bz2
diff --git a/sources b/sources
index 7d3b21a..91a38b1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d9e9f69f9c6ef5c5a8255cfbe6a57d51  xkeyboard-config-1.3.tar.bz2
+a9fe7efbc67a6966c4d4501f0cf88073  xkeyboard-config-1.4.tar.bz2
diff --git a/xkeyboard-config.spec b/xkeyboard-config.spec
index d91071c..96d07ad 100644
--- a/xkeyboard-config.spec
+++ b/xkeyboard-config.spec
@@ -3,8 +3,8 @@
 
 Summary: xkeyboard-config alternative xkb data files
 Name: xkeyboard-config
-Version: 1.3
-Release: 2%{?dist}
+Version: 1.4
+Release: 1%{?dist}
 License: MIT
 Group: User Interface/X
 URL: http://www.x.org
@@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Source0: http://xlibs.freedesktop.org/xkbdesc/%{name}-%{version}.tar.bz2
 Patch1: olpc-xkeyboard-config-kz-group.patch
 Patch2: usinet.patch
-# Bug 241564, FDO bug 17786 (resolved, fixed)
-Patch3: xkeyboard-config-1.3-AC11-mapping-is.patch
 
 BuildArch: noarch
 
@@ -45,7 +43,6 @@ xkeyboard-config alternative xkb data files
 %setup -q
 %patch1 -p1 -b .kzgroup
 %patch2 -p1 -b .usinet
-%patch3 -p1 -b .AC11-mapping-is
 
 %build
 %configure \
@@ -85,6 +82,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/X11/xkb/rules/xorg.xml
 
 %changelog
+* Wed OCt  1 2008 Matthias Clasen  <mclasen@redhat.com> 1.4-1
+- Update to 1.4
+
 * Mon Sep 29 2008 Peter Hutterer  <peter.hutterer@redhat.com> - 1.3-2
 - xkeyboard-config-1.3-AC11-mapping-is.patch: fix AC11 mapping for icelandic
   keyboard layout (#241564)