rpms/libgnomekbd/devel libxklavier4.patch, NONE, 1.1 libgnomekbd.spec, 1.45, 1.46

[Matthias Clasen]

Author: mclasen

Update of /cvs/pkgs/rpms/libgnomekbd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23462

Modified Files:
	libgnomekbd.spec 
Added Files:
	libxklavier4.patch 
Log Message:
adapt to libxklavier api changes


libxklavier4.patch:

--- NEW FILE libxklavier4.patch ---
diff -up libgnomekbd-2.27.2/libgnomekbd/gkbd-indicator.c.libxklavier4 libgnomekbd-2.27.2/libgnomekbd/gkbd-indicator.c
--- libgnomekbd-2.27.2/libgnomekbd/gkbd-indicator.c.libxklavier4	2009-06-30 16:54:39.781872916 -0400
+++ libgnomekbd-2.27.2/libgnomekbd/gkbd-indicator.c	2009-06-30 16:54:59.058123750 -0400
@@ -717,7 +717,7 @@ gkbd_indicator_global_init (void)
 	globals.registry =
 	    xkl_config_registry_get_instance (globals.engine);
 
-	xkl_config_registry_load (globals.registry);
+	xkl_config_registry_load (globals.registry, FALSE);
 
 	gconf_client = gconf_client_get_default ();
 


Index: libgnomekbd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgnomekbd/devel/libgnomekbd.spec,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- libgnomekbd.spec	30 Jun 2009 20:36:07 -0000	1.45
+++ libgnomekbd.spec	30 Jun 2009 20:59:20 -0000	1.46
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:       	2.27.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -8,6 +8,8 @@ License:        LGPLv2+
 URL:            http://gswitchit.sourceforge.net
 Source0:        http://download.gnome.org/sources/libgnomekbd/2.27/libgnomekbd-%{version}.tar.bz2
 
+Patch0: libxklavier4.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  dbus-devel >= 0.92
@@ -59,6 +61,7 @@ of the keyboard indicator applet.
 
 %prep
 %setup -q
+%patch0 -p1 -b .libxklavier4
 
 %build
 %configure --disable-static --enable-compile-warnings=no
@@ -128,8 +131,9 @@ touch --no-create %{_datadir}/icons/hico
 
 
 %changelog
-* Tue Jun 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-2
+* Tue Jun 30 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-3
 - Rebuild against new libxklavier
+- Adapt to api changes
 
 * Sun May 31 2009 Matthias Clasen <mclasen at redhat.com> - 2.27.2-1
 - Update to 2.27.2