-diff -urN libgnomekbd-2.18.1/capplet/gkbd-indicator-plugins-capplet.desktop.in.in libgnomekbd-2.18.1.new/capplet/gkbd-indicator-plugins-capplet.desktop.in.in
---- libgnomekbd-2.18.1/capplet/gkbd-indicator-plugins-capplet.desktop.in.in 2007-03-17 23:40:04.000000000 +0100
-+++ libgnomekbd-2.18.1.new/capplet/gkbd-indicator-plugins-capplet.desktop.in.in 2007-04-09 11:29:52.000000000 +0200
+diff -urN libgnomekbd-2.19.91/capplet/gkbd-indicator-plugins-capplet.desktop.in.in libgnomekbd-2.19.91.new/capplet/gkbd-indicator-plugins-capplet.desktop.in.in
+--- libgnomekbd-2.19.91/capplet/gkbd-indicator-plugins-capplet.desktop.in.in 2007-08-29 17:58:10.000000000 +0200
++++ libgnomekbd-2.19.91.new/capplet/gkbd-indicator-plugins-capplet.desktop.in.in 2007-08-29 18:01:35.000000000 +0200
@@ -7,7 +7,7 @@
Terminal=false
Type=Application
StartupNotify=true
--Categories=GNOME;Settings;DesktopSettings
+-Categories=GNOME;Settings;DesktopSettings;
+Categories=GTK;GNOME;Settings;DesktopSettings;
OnlyShowIn=GNOME;
+ NoDisplay=true
X-GNOME-Bugzilla-Bugzilla=GNOME
- X-GNOME-Bugzilla-Product=libgnomekbd
Summary: A keyboard configuration library
Summary(pl.UTF-8): Biblioteka do konfiguracji klawiatury
Name: libgnomekbd
-Version: 2.18.1
+Version: 2.20.0
Release: 1
License: LGPL
Group: Libraries
-Source0: http://ftp.gnome.org/pub/gnome/sources/libgnomekbd/2.18/%{name}-%{version}.tar.bz2
-# Source0-md5: 4d69db2ad5f7e8e71ed4fa167381e239
+Source0: http://ftp.gnome.org/pub/GNOME/sources/libgnomekbd/2.20/%{name}-%{version}.tar.bz2
+# Source0-md5: 0b495d355e25c3531419cb3996be7e28
Patch0: %{name}-desktop.patch
+Patch1: %{name}-popt.patch
URL: http://www.gnome.org/
-BuildRequires: GConf2-devel >= 2.18.0.1
+BuildRequires: GConf2-devel >= 2.19.1
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1:1.8
BuildRequires: dbus-glib-devel >= 0.73
-BuildRequires: gtk+2-devel >= 2:2.10.10
-BuildRequires: intltool >= 0.35.5
-BuildRequires: libglade2-devel >= 1:2.6.0
-BuildRequires: libgnomeui-devel >= 2.18.1
+BuildRequires: gtk+2-devel >= 2:2.10.14
+BuildRequires: intltool >= 0.36.1
+BuildRequires: libglade2-devel >= 1:2.6.2
+BuildRequires: libgnomeui-devel >= 2.19.1
BuildRequires: libtool
-BuildRequires: libxklavier-devel >= 3.0
+BuildRequires: libxklavier-devel >= 3.2
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.311
Requires(post,postun): /sbin/ldconfig
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
%{__glib_gettextize}