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
This commit is contained in:
Hillwood Yang 2020-02-25 12:01:58 +00:00 committed by Git OBS Bridge
parent 317a60f1af
commit 44f967a0d4
2 changed files with 11 additions and 1 deletions

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Feb 24 14:27:11 UTC 2020 - Fuminobu Takeyama <ftake@geeko.jp>
- 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 <hillwood@opensuse.org>

View File

@ -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