- rel.5 - libxklavier5 patch from FC

Changed files:
    xfce4-settings-libxklavier5.patch -> 1.1
    xfce4-settings.spec -> 1.9

diff --git a/xfce4-settings-libxklavier5.patch b/xfce4-settings-libxklavier5.patch
new file mode 100644 (file)
index 0000000..544906c
--- /dev/null
+++ b/xfce4-settings-libxklavier5.patch
@@ -0,0 +1,11 @@
+--- ./dialogs/keyboard-settings/xfce-keyboard-settings.c.org   2010-04-30 18:29:46.201317308 +0200
++++ ./dialogs/keyboard-settings/xfce-keyboard-settings.c       2010-04-30 18:30:34.551318908 +0200
+@@ -453,7 +453,7 @@ xfce_keyboard_settings_finalize (GObject
+ 
+ #ifdef HAVE_LIBXKLAVIER
+   /* Stop xklavier engine */
+-  xkl_engine_stop_listen (settings->priv->xkl_engine);
++  xkl_engine_stop_listen (settings->priv->xkl_engine,XKLL_TRACK_KEYBOARD_STATE);
+ #endif /* HAVE_LIBXKLAVIER */
+ 
+   g_object_unref (settings->priv->provider);

diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index c96a92dbbede98d62013188a76851485061dd789..f0baef4d0966de02e8e3661a48f384d8a6b4c26e 100644 (file)
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -2,13 +2,14 @@ Summary:      Settings manager for the Xfce desktop environment
 Summary(pl.UTF-8):     Menadżer ustawień dla środowiska Xfce
 Name:          xfce4-settings
 Version:       4.6.1
-Release:       4
+Release:       5
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://www.xfce.org/archive/xfce-%{version}/src/%{name}-%{version}.tar.bz2
 # Source0-md5: dc1c8704471c5b0104fa10c30eb60cb6
 Patch0:                %{name}-default-icon-theme.patch
 Patch1:                %{name}-libxklavier4.patch
+Patch2:                %{name}-libxklavier5.patch
 URL:           http://www.xfce.org/projects/xfce4-settings/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
@@ -44,6 +45,7 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób dostosowywać
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__intltoolize}