From 44f967a0d4e6c82a6360931cae8e8340f1746bb767e2a45ad76dcd2063ee59df Mon Sep 17 00:00:00 2001 From: Hillwood Yang Date: Tue, 25 Feb 2020 12:01:58 +0000 Subject: [PATCH] Accepting request 778826 from home:ftake:branches:M17N Can you check this change carefully? - Fix dependency between ibus and ibus-dict-emoji * Keep ibus and ibus-dict-emoji from the same source * Add Conflict to remove old ibus containing emoji dictionary files OBS-URL: https://build.opensuse.org/request/show/778826 OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=222 --- ibus.changes | 8 ++++++++ ibus.spec | 4 +++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/ibus.changes b/ibus.changes index b063468..ad12b94 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Feb 24 14:27:11 UTC 2020 - Fuminobu Takeyama + +- Fix dependency between ibus and ibus-dict-emoji + * Keep ibus and ibus-dict-emoji from the same source + * Add Conflict to remove old ibus containing emoji dictionary + files + ------------------------------------------------------------------- Sat Feb 22 12:30:37 UTC 2020 - Hillwood Yang diff --git a/ibus.spec b/ibus.spec index fcab041..beaf34a 100644 --- a/ibus.spec +++ b/ibus.spec @@ -88,7 +88,7 @@ BuildRequires: pkgconfig(libnotify) BuildRequires: pkgconfig(vapigen) BuildRequires: pkgconfig(xkbcommon) %if %{with_emoji} -Requires: %{name}-dict-emoji +Requires: %{name}-dict-emoji = %{version} %endif Requires: dconf Requires: iso-codes @@ -144,6 +144,8 @@ This package contains the introspection bindings for the IBus library. Summary: Emoji dictionary for IBus Group: System/I18n/Chinese BuildArch: noarch +# make sure old ibus package containing emoji dict files is updated +Conflicts: ibus < 1.5.22 %description dict-emoji This package contains data of emoji dictionary for IBus and other applications