diff --git a/ibus-hangul-dconf-prefix.patch b/ibus-hangul-dconf-prefix.patch new file mode 100644 index 0000000..cdb5cdf --- /dev/null +++ b/ibus-hangul-dconf-prefix.patch @@ -0,0 +1,26 @@ +From 3e7c5811d38d64d5e13d8e6ce54db103968561bd Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Tue, 2 Apr 2013 13:52:29 +0900 +Subject: [PATCH] Work around for the case ibus-dconf sends lowercase config + section + +--- + src/engine.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/engine.c b/src/engine.c +index 602f073..456e353 100644 +--- a/src/engine.c ++++ b/src/engine.c +@@ -1269,7 +1269,7 @@ ibus_config_value_changed (IBusConfig *config, + { + IBusHangulEngine *hangul = (IBusHangulEngine *) user_data; + +- if (strcmp(section, "engine/Hangul") == 0) { ++ if (g_ascii_strcasecmp(section, "engine/Hangul") == 0) { + if (strcmp(name, "HangulKeyboard") == 0) { + const gchar *str = g_variant_get_string(value, NULL); + g_string_assign (hangul_keyboard, str); +-- +1.8.1.4 + diff --git a/ibus-hangul.spec b/ibus-hangul.spec index 0e50a63..bd45ad3 100644 --- a/ibus-hangul.spec +++ b/ibus-hangul.spec @@ -1,21 +1,9 @@ %global require_ibus_version 1.3.99 %global require_libhangul_version 0.1.0 -# bridge hotkey local feature was enabled in ibus for F-15 and F-16 -%if 0%{?fedora} > 16 || 0%{?rhel} > 6 -%define have_bridge_hotkey 0 -%else -%define have_bridge_hotkey 1 -%endif -# ibus pulls pygobject3 since F-17 -%if 0%{?fedora} > 16 || 0%{?rhel} > 6 -%define need_pygobject3 0 -%else -%define need_pygobject3 1 -%endif Name: ibus-hangul Version: 1.4.2 -Release: 2%{?dist} +Release: 3%{?dist} Summary: The Hangul engine for IBus input platform License: GPLv2+ Group: System Environment/Libraries @@ -24,9 +12,7 @@ Source0: http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz # upstreamed patches #Patch0: ibus-hangul-HEAD.patch # not upstreamed patches -%if %have_bridge_hotkey -Patch1: ibus-hangul-add-hangul-hotkey.patch -%endif +Patch1: ibus-hangul-dconf-prefix.patch BuildRequires: gettext-devel, automake, libtool BuildRequires: intltool @@ -39,9 +25,7 @@ BuildRequires: python2-devel Requires: ibus >= %{require_ibus_version} Requires: libhangul >= %{require_libhangul_version} -%if %need_pygobject3 Requires: pygobject3 -%endif %description The Hangul engine for IBus platform. It provides Korean input method from @@ -50,10 +34,6 @@ libhangul. %prep %setup -q -%if %have_bridge_hotkey -%patch1 -p1 -b .add-hangul-hotkey -%endif - autopoint -f AUTOPOINT='intltoolize --automake --copy' autoreconf -fi @@ -93,18 +73,24 @@ fi %{_datadir}/icons/hicolor/*/apps/* %changelog -* Wed Mar 27 2013 Daiki Ueno - 1.4.2-2 -- pull the latest config.guess and config.sub for ARM64 port +* Tue Apr 2 2013 Daiki Ueno - 1.4.2-3 +- Remove have_bridge_hotkey and need_pygobject3 macros which does no + longer make sense after F17 +- Add ibus-hangul-dconf-prefix.patch +- Fix bug 909509 - Hangul Keybaord doesn't be changed in IBusHangul Setup + +* Wed Mar 27 2013 Daiki Ueno - 1.4.2-2 +- Pull the latest config.guess and config.sub for ARM64 port * Tue Jan 29 2013 Daiki Ueno - 1.4.2-1 - Update version to 1.4.2. - Remove ibus-hangul-setup-gi.patch * Wed Nov 21 2012 Daiki Ueno - 1.4.1-9 -- fix a typo (R: -> BR: python2-devel) +- Fix a typo (R: -> BR: python2-devel) * Wed Nov 21 2012 Daiki Ueno - 1.4.1-8 -- cleanup the spec file +- Cleanup the spec file * Thu Nov 15 2012 Daiki Ueno - 1.4.1-7 - Re-add ibus-hangul-HEAD.patch based on recent upstream change