From d0db49d13496966543642495921aed9379407800 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@fedoraproject.org>
Date: Sun, 17 Jan 2010 04:28:09 +0000
Subject: [PATCH] 2.29.5

---
 .cvsignore       |  2 +-
 libgnomekbd.spec | 18 +++++++++---------
 sources          |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 74bb03c..f1a8156 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgnomekbd-2.28.0.tar.bz2
+libgnomekbd-2.29.5.tar.bz2
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 5cddcfb..66cce8d 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
-Version:        2.28.0
-Release:        4%{?dist}
+Version:        2.29.5
+Release:        1%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -13,12 +13,12 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  dbus-devel >= 0.92
 BuildRequires:  dbus-glib >= 0.34
 BuildRequires:  GConf2-devel >= 2.14.0
-BuildRequires:  gtk2-devel >= 2.10.3
+BuildRequires:  gtk2-devel >= 2.13
 BuildRequires:  cairo-devel
 BuildRequires:  libglade2-devel >= 2.6.0
 BuildRequires:  libgnome-devel >= 2.16.0
 BuildRequires:  libgnomeui-devel >= 2.16.0
-BuildRequires:  libxklavier-devel >= 3.4
+BuildRequires:  libxklavier-devel >= 5.0
 BuildRequires:  desktop-file-utils
 BuildRequires:  gettext
 BuildRequires:  intltool
@@ -27,9 +27,6 @@ Requires(pre): GConf2
 Requires(post): GConf2
 Requires(preun): GConf2
 
-# upstream fixes
-Patch0: 0001-Properly-handle-scenario-when-one-keycode-has-multip.patch
-Patch1: 0002-Improved-indicator-background-handling.patch
 
 %description
 The libgnomekbd package contains a GNOME library which manages
@@ -61,10 +58,10 @@ The libgnomekbd-capplet package contains a configuration applet to
 select libgnomekbd plugins. These plugins can modify the appearance
 of the keyboard indicator applet.
 
+
 %prep
 %setup -q
-%patch0 -p1 -b .multiple-keys
-%patch1 -p1 -b .indicator-background
+
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -135,6 +132,9 @@ touch --no-create %{_datadir}/icons/hicolor || :
 
 
 %changelog
+* Sat Jan 16 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.5-1
+- Update 2.29.5
+
 * Thu Dec 03 2009 Bastien Nocera <bnocera@redhat.com> 2.28.0-4
 - Remove debug in patch
 
diff --git a/sources b/sources
index 37c8773..da973c9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b0989c4a2dbe2b5dd892d14195674f2b  libgnomekbd-2.28.0.tar.bz2
+f16878ffd00eb8fb9df1e81fd21f6d6c  libgnomekbd-2.29.5.tar.bz2