diff --git a/ibus-hangul-1.5.1.tar.gz b/ibus-hangul-1.5.1.tar.gz deleted file mode 100644 index 744782b..0000000 Binary files a/ibus-hangul-1.5.1.tar.gz and /dev/null differ diff --git a/ibus-hangul-1.5.5.tar.xz b/ibus-hangul-1.5.5.tar.xz new file mode 100644 index 0000000..491ac42 Binary files /dev/null and b/ibus-hangul-1.5.5.tar.xz differ diff --git a/ibus-hangul-setup-abspath.patch b/ibus-hangul-setup-abspath.patch new file mode 100644 index 0000000..077c618 --- /dev/null +++ b/ibus-hangul-setup-abspath.patch @@ -0,0 +1,36 @@ +From e9bf85e48e204392ba26fcb5767a02ac31486583 Mon Sep 17 00:00:00 2001 +From: Daiki Ueno +Date: Mon, 28 Oct 2013 17:28:26 +0900 +Subject: [PATCH] Invoke ibus-setup-hangul with the absolute path + +Partially revert 8d3735e4, which installs ibus-setup-hangul under +bindir. +--- + src/engine.c | 13 +++++++++++-- + 1 file changed, 11 insertions(+), 2 deletions(-) + +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, }; ++ gchar *path; ++ const char* libexecdir; + +- argv[0] = "ibus-setup-hangul"; ++ libexecdir = g_getenv("LIBEXECDIR"); ++ if (libexecdir == NULL) ++ libexecdir = LIBEXECDIR; ++ ++ path = g_build_filename(libexecdir, "ibus-setup-hangul", NULL); ++ argv[0] = path; + 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, "InputMode") == 0) { + IBusHangulEngine *hangul = (IBusHangulEngine *) engine; + diff --git a/ibus-hangul.spec b/ibus-hangul.spec index ec65854..037ce21 100644 --- a/ibus-hangul.spec +++ b/ibus-hangul.spec @@ -1,13 +1,16 @@ Name: ibus-hangul Summary: a Korean input method engine for IBus -Version: 1.5.1 -Release: 4 +Version: 1.5.5 +Release: 1 License: GPLv2+ URL: https://github.com/libhangul/%{name} -Source0: https://github.com/libhangul/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +Source0: https://github.com/libhangul/%{name}/releases/download/%{version}/%{name}-%{version}.tar.xz + +Patch001: ibus-hangul-setup-abspath.patch BuildRequires: gettext-devel automake intltool libtool gnome-common python3 pkgconfig BuildRequires: libhangul-devel >= 0.1.0 ibus-devel >= 1.3.99 desktop-file-utils +BuildRequires: gtk3-devel Requires: ibus >= 1.3.99 libhangul >= 0.1.0 python3-gobject python3 @@ -29,21 +32,29 @@ libhangul. %install make DESTDIR=%{buildroot} install INSTALL="install -p" -install -d %{buildroot}%{_datadir}/appdata + +%py_byte_compile %{__python3} $RPM_BUILD_ROOT%{_datadir}/ibus-hangul/setup + +rm -f ${RPM_BUILD_ROOT}%{_bindir}/ibus-setup-hangul sed -i 's!^Exec=ibus-setup-hangul!Exec=%{_libexecdir}/ibus-setup-hangul!' %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop desktop-file-validate %{buildroot}%{_datadir}/applications/ibus-setup-hangul.desktop %find_lang %{name} +%check +make check \ + DISABLE_GUI_TESTS="ibus-hangul" \ + VERBOSE=1 + %files -f %{name}.lang %{_libexecdir}/ibus-setup-hangul %{_libexecdir}/ibus-engine-hangul %{_datadir}/icons/hicolor/*/apps/* +%{_datadir}/metainfo/*.metainfo.xml %{_datadir}/glib-2.0/schemas/*.gschema.xml %{_datadir}/applications/ibus-setup-hangul.desktop %{_datadir}/ibus/component/* %{_datadir}/%{name} -%exclude %{_bindir}/ibus-setup-hangul %files help %doc README COPYING AUTHORS @@ -59,6 +70,9 @@ if [ -x %{_bindir}/ibus ];then fi %changelog +* Fri Sep 01 2023 chenchen - 1.5.5-1 +- Upgrade to version 1.5.5 + * Fri Jan 17 2020 wangzhishun1 - 1.5.1-4 - Type:bugfix - ID:NA