[libgnomekbd/f17] Fix problem with custom options not being loaded

[Owen Taylor]

commit 75c183fe708ff23ee75ecf5c8cf0f1a32ad53483
Author: Owen W. Taylor <otaylor at fishsoup.net>
Date:   Thu Apr 5 10:18:26 2012 -0400

    Fix problem with custom options not being loaded
    
    Add a patch from upstream to fix a bug where keyboard layouts sometimes
    wouldn't get loaded since they were mistakenly though to be the same as
    the current layout.

 ...rd_config_options_equals-fix-comparison-o.patch |   20 ++++++++++++++++++++
 libgnomekbd.spec                                   |   11 ++++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/gkbd_keyboard_config_options_equals-fix-comparison-o.patch b/gkbd_keyboard_config_options_equals-fix-comparison-o.patch
new file mode 100644
index 0000000..4df6ec6
--- /dev/null
+++ b/gkbd_keyboard_config_options_equals-fix-comparison-o.patch
@@ -0,0 +1,20 @@
+diff -up libgnomekbd-3.4.0.2/libgnomekbd/gkbd-keyboard-config.c.compare-options libgnomekbd-3.4.0.2/libgnomekbd/gkbd-keyboard-config.c
+--- libgnomekbd-3.4.0.2/libgnomekbd/gkbd-keyboard-config.c.compare-options	2012-03-26 15:11:15.000000000 -0400
++++ libgnomekbd-3.4.0.2/libgnomekbd/gkbd-keyboard-config.c	2012-04-05 10:13:03.403337774 -0400
+@@ -526,12 +526,16 @@ gkbd_keyboard_config_options_equals (Gkb
+ 			if (!gkbd_keyboard_config_split_items (kbd_config1->options[i], &group1, &option1))
+ 				continue;
+ 
++			option1 = g_strdup (option1);
++
+ 			for (j = 0; j < num_options && !are_equal; j++) {
+ 				if (gkbd_keyboard_config_split_items (kbd_config2->options[j], &group2, &option2)) {
+ 					are_equal = strcmp (option1, option2) == 0;
+ 				}
+ 			}
+ 
++			g_free (option1);
++
+ 			if (!are_equal)
+ 				return False;
+ 		}
diff --git a/libgnomekbd.spec b/libgnomekbd.spec
index 8fd989c..9213bb4 100644
--- a/libgnomekbd.spec
+++ b/libgnomekbd.spec
@@ -1,6 +1,6 @@
 Name:           libgnomekbd
 Version:        3.4.0.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        A keyboard configuration library
 
 Group:          System Environment/Libraries
@@ -9,6 +9,9 @@ URL:            http://gswitchit.sourceforge.net
 # VCS: git:git://git.gnome.org/libgnomekbd
 Source0:        http://download.gnome.org/sources/libgnomekbd/3.4/libgnomekbd-%{version}.tar.xz
 
+# https://bugzilla.gnome.org/show_bug.cgi?id=673539
+Patch0:         gkbd_keyboard_config_options_equals-fix-comparison-o.patch
+
 BuildRequires:  gtk3-devel >= 3.0.0
 BuildRequires:  cairo-devel
 BuildRequires:  libxklavier-devel
@@ -41,6 +44,7 @@ developing applications that use libgnomekbd.
 
 %prep
 %setup -q
+%patch0 -p1 -b .compare-options
 
 %build
 %configure --disable-static \
@@ -101,6 +105,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Thu Apr  5 2012 Owen Taylor <otaylor at redhat.com> - 3.4.0.2-2
+- Add a patch from upstream to fix a bug where keyboard layouts sometimes
+  wouldn't get loaded since they were mistakenly though to be the same as
+  the current layout.
+
 * Tue Mar 27 2012 Richard Hughes <hughsient at gmail.com> - 3.4.0.2-1
 - Update to 3.4.0.2