rpms/xfce4-settings/devel xfce4-settings-4.6.1-xkl.patch, NONE, 1.1 xfce4-settings.spec, 1.13, 1.14

[Kevin Fenzi]

Author: kevin

Update of /cvs/extras/rpms/xfce4-settings/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4856

Modified Files:
	xfce4-settings.spec 
Added Files:
	xfce4-settings-4.6.1-xkl.patch 
Log Message:
Update for new libxklavier


xfce4-settings-4.6.1-xkl.patch:

--- NEW FILE xfce4-settings-4.6.1-xkl.patch ---
diff -Nur xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c
--- xfce4-settings-4.6.1.orig/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-03-02 10:48:00.000000000 -0700
+++ xfce4-settings-4.6.1/dialogs/keyboard-settings/xfce-keyboard-settings.c	2009-07-03 13:24:25.000000000 -0600
@@ -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");


Index: xfce4-settings.spec
===================================================================
RCS file: /cvs/extras/rpms/xfce4-settings/devel/xfce4-settings.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- xfce4-settings.spec	20 Apr 2009 02:52:40 -0000	1.13
+++ xfce4-settings.spec	3 Jul 2009 19:54:23 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           xfce4-settings
 Version:        4.6.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Settings Manager for Xfce
 
 Group:          User Interface/Desktops
@@ -8,6 +8,7 @@ Group:          User Interface/Desktops
 License:        GPLv2+ and GPLv2
 URL:            http://www.xfce.org/
 Source0:        http://www.xfce.org/archive/xfce-%{version}/src/xfce4-settings-%{version}.tar.bz2
+Patch1:         xfce4-settings-4.6.1-xkl.patch
 # use vendor's artwork
 Patch10:        xfce4-settings-4.6.0-fedora.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -38,6 +39,7 @@ This package includes the settings manag
 %prep
 %setup -q
 %patch10 -p1 -b .vendor
+%patch1 -p1 -b .xkl
 
 %build
 %configure --enable-sound-settings
@@ -109,6 +111,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/applications/xfce*.desktop
 
 %changelog
+* Fri Jul 03 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-2
+- Update for new libxklavier
+
 * Sun Apr 19 2009 Kevin Fenzi <kevin at tummy.com> - 4.6.1-1
 - Update to 4.6.1