diff --git a/libgnomekbd.spec b/libgnomekbd.spec index fffc1d2..afb79f3 100644 --- a/libgnomekbd.spec +++ b/libgnomekbd.spec @@ -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/hicolor || : %changelog -* Tue Jun 30 2009 Matthias Clasen - 2.27.2-2 +* Tue Jun 30 2009 Matthias Clasen - 2.27.2-3 - Rebuild against new libxklavier +- Adapt to api changes * Sun May 31 2009 Matthias Clasen - 2.27.2-1 - Update to 2.27.2 diff --git a/libxklavier4.patch b/libxklavier4.patch new file mode 100644 index 0000000..832b223 --- /dev/null +++ b/libxklavier4.patch @@ -0,0 +1,12 @@ +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 (); +