[ibus-hangul] Update to 1.5.0-1
Daiki Ueno
ueno at fedoraproject.org
Wed Nov 26 03:17:08 UTC 2014
commit f3f7976f49627b0c243f1de6b3c4672c3c8bd8e2
Author: Daiki Ueno <dueno at redhat.com>
Date: Wed Nov 26 12:16:59 2014 +0900
Update to 1.5.0-1
.gitignore | 1 +
ibus-hangul-dconf-prefix.patch | 26 --------------------------
ibus-hangul-setup-abspath.patch | 21 +++++++++------------
ibus-hangul-setup-ui.patch | 12 ------------
ibus-hangul.spec | 26 ++++++++++++++------------
sources | 2 +-
6 files changed, 25 insertions(+), 63 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e254b8f..ac7a048 100644
--- a/.gitignore
+++ b/.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
diff --git a/ibus-hangul-setup-abspath.patch b/ibus-hangul-setup-abspath.patch
index 1b1d4d2..077c618 100644
--- a/ibus-hangul-setup-abspath.patch
+++ b/ibus-hangul-setup-abspath.patch
@@ -1,18 +1,19 @@
From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001
-From: Daiki Ueno <ueno at unixuser.org>
+From: Daiki Ueno <dueno at 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
-
diff --git a/ibus-hangul.spec b/ibus-hangul.spec
index 2997860..6ce5938 100644
--- a/ibus-hangul.spec
+++ b/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 at 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 at redhat.com> - 1.4.2-10
- Add ibus-hangul-setup-ui.patch
- Fix bug 1115411 - [abrt] ibus-hangul: main.py:43:__init__:Error:
diff --git a/sources b/sources
index 3f874f4..f7b4b03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0229eab9481355bb5f54230890bfa910 ibus-hangul-1.4.2.tar.gz
+a171bf7b25752a1f71257fb85d56346b ibus-hangul-1.5.0.tar.gz
More information about the scm-commits
mailing list