Update to 1.5.0-1

.gitignore

@@ -6,3 +6,4 @@ ibus-hangul-1.3.0.20100329.tar.gz
 /ibus-hangul-1.4.0.tar.gz
 /ibus-hangul-1.4.1.tar.gz
 /ibus-hangul-1.4.2.tar.gz
+/ibus-hangul-1.5.0.tar.gz

ibus-hangul-dconf-prefix.patch

@@ -1,26 +0,0 @@
-From 3e7c5811d38d64d5e13d8e6ce54db103968561bd Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
-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
-

ibus-hangul-setup-abspath.patch

@@ -1,18 +1,19 @@
 From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno@unixuser.org>
+From: Daiki Ueno <dueno@redhat.com>
 Date: Mon, 28 Oct 2013 17:28:26 +0900
 Subject: [PATCH] Invoke ibus-setup-hangul with the absolute path
 
-Partially 8d3735e4, which installs ibus-setup-hangul under bindir.
+Partially revert 8d3735e4, which installs ibus-setup-hangul under
+bindir.
 ---
  src/engine.c | 13 +++++++++++--
  1 file changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/src/engine.c b/src/engine.c
-index 602f073..e918a15 100644
---- a/src/engine.c
-+++ b/src/engine.c
-@@ -1201,10 +1201,19 @@ ibus_hangul_engine_property_activate (IBusEngine    *engine,
+Index: ibus-hangul-1.5.0/src/engine.c
+===================================================================
+--- ibus-hangul-1.5.0.orig/src/engine.c
++++ ibus-hangul-1.5.0/src/engine.c
+@@ -1337,10 +1337,18 @@ ibus_hangul_engine_property_activate (IB
      if (strcmp(prop_name, "setup") == 0) {
          GError *error = NULL;
          gchar *argv[2] = { NULL, };
@@ -29,11 +30,7 @@ index 602f073..e918a15 100644
          argv[1] = NULL;
 -        g_spawn_async (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, &error);
 +        g_spawn_async (NULL, argv, NULL, 0, NULL, NULL, NULL, &error);
-+
 +        g_free(path);
-     } else if (strcmp(prop_name, "hanja_mode") == 0) {
+     } else if (strcmp(prop_name, "InputMode") == 0) {
          IBusHangulEngine *hangul = (IBusHangulEngine *) engine;
  
--- 
-1.8.3.1
-

ibus-hangul-setup-ui.patch

@@ -1,12 +0,0 @@
-Index: ibus-hangul-1.4.2/setup/setup.ui
-===================================================================
---- ibus-hangul-1.4.2.orig/setup/setup.ui
-+++ ibus-hangul-1.4.2/setup/setup.ui
-@@ -18,7 +18,6 @@
-             <property name="visible">True</property>
-             <property name="can_focus">True</property>
-             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
--            <property name="tab_hborder">4</property>
-             <child>
-               <object class="GtkVBox" id="vbox1">
-                 <property name="visible">True</property>

ibus-hangul.spec

@@ -2,8 +2,8 @@
 %global require_libhangul_version 0.1.0
 
 Name:       ibus-hangul
-Version:    1.4.2
-Release:    10%{?dist}
+Version:    1.5.0
+Release:    1%{?dist}
 Summary:    The Hangul engine for IBus input platform
 License:    GPLv2+
 Group:      System Environment/Libraries
@@ -12,11 +12,7 @@ Source0:    http://ibus.googlecode.com/files/%{name}-%{version}.tar.gz
 # upstreamed patches
 #Patch0:     ibus-hangul-HEAD.patch
 # not upstreamed patches
-Patch1:     ibus-hangul-dconf-prefix.patch
-Patch2:     ibus-hangul-setup-abspath.patch
-# for bug 1115411, this was already fixed in upstream as part of:
-# https://github.com/choehwanjin/ibus-hangul/commit/8cffcc0b0141d5dc43d96f26a5e7244dfbe1a556
-Patch3:	    ibus-hangul-setup-ui.patch
+Patch1:     ibus-hangul-setup-abspath.patch
 
 BuildRequires:  gettext-devel, automake, libtool
 BuildRequires:  intltool
@@ -37,12 +33,10 @@ libhangul.
 
 %prep
 %setup -q
-%patch1 -p1 -b .dconf-prefix
-%patch2 -p1 -b .setup-abspath
-%patch3 -p1 -b .setup-ui
+%patch1 -p1 -b .setup-abspath
 
-autopoint -f
-AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
+# autopoint -f
+# AUTOPOINT='intltoolize --automake --copy' autoreconf -fi
 
 %build
 %configure --disable-static %{?_with_hotkeys}
@@ -61,12 +55,16 @@ desktop-file-validate ${RPM_BUILD_ROOT}%{_datadir}/applications/ibus-setup-hangu
 
 %post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
+[ -x %{_bindir}/ibus ] && \
+  %{_bindir}/ibus write-cache --system &>/dev/null || :
 
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
@@ -82,6 +80,10 @@ fi
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Wed Nov 26 2014 Daiki Ueno <dueno@redhat.com> - 1.5.0-1
+- Update version to 1.5.0
+- Drop upstreamed patches: dconf-prefix.patch and setup-ui.patch
+
 * Tue Sep 16 2014 Daiki Ueno <dueno@redhat.com> - 1.4.2-10
 - Add ibus-hangul-setup-ui.patch
 - Fix bug 1115411 - [abrt] ibus-hangul: main.py:43:__init__:Error:

sources

@@ -1 +1 @@
-0229eab9481355bb5f54230890bfa910  ibus-hangul-1.4.2.tar.gz
+a171bf7b25752a1f71257fb85d56346b  ibus-hangul-1.5.0.tar.gz