- release 2: -libxklavier4.patch

Changed files:
    xfce4-settings-libxklavier4.patch -> 1.1
    xfce4-settings.spec -> 1.5

diff --git a/xfce4-settings-libxklavier4.patch b/xfce4-settings-libxklavier4.patch
new file mode 100644 (file)
index 0000000..7ea85c3
--- /dev/null
+++ b/xfce4-settings-libxklavier4.patch
@@ -0,0 +1,11 @@
+--- xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c~   2009-09-27 23:55:33.835021249 +0200
++++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c    2009-09-27 23:55:38.032312529 +0200
+@@ -378,7 +378,7 @@
+   xkl_config_rec_get_from_server (settings->priv->xkl_rec_config, settings->priv->xkl_engine);
+ 
+   settings->priv->xkl_registry = xkl_config_registry_get_instance (settings->priv->xkl_engine);
+-  xkl_config_registry_load (settings->priv->xkl_registry);
++  xkl_config_registry_load (settings->priv->xkl_registry, FALSE);
+ 
+   /* Tab */
+   xkb_tab_layout_vbox = glade_xml_get_widget (settings->priv->glade_xml, "xkb_tab_layout_vbox");

diff --git a/xfce4-settings.spec b/xfce4-settings.spec
index e1122f9ece6d2a3786d6cd38e078a69cdd1c0699..1d8f763cbfed9cb295e8688dc54ab46df3a1ebcc 100644 (file)
--- a/xfce4-settings.spec
+++ b/xfce4-settings.spec
@@ -2,12 +2,13 @@ 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:       1
+Release:       2
 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
 URL:           http://www.xfce.org/projects/xfce4-settings/
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake >= 1:1.8
@@ -42,6 +43,7 @@ Menadżer ustawień pozwala w łatwy i intuicyjny sposób dostosowywać
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__intltoolize}