diff --git a/ibus.changes b/ibus.changes index 22bd03d..29d189d 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Sep 24 07:01:32 UTC 2020 - Cliff Zhao + +- Update ibus.spec: Drop the is_opensuse macro to eliminate the + difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084). + ------------------------------------------------------------------- Tue May 12 07:32:41 UTC 2020 - QK ZHU diff --git a/ibus.spec b/ibus.spec index 542786c..c1eb009 100644 --- a/ibus.spec +++ b/ibus.spec @@ -109,11 +109,6 @@ BuildRequires: pkgconfig(wayland-client) >= 1.2.0 BuildRequires: unicode-emoji BuildRequires: pkgconfig(cldr-emoji-annotation) %endif -# PATCH-FEATURE-SLE FATE#319095 qzhao@suse.com -# Add conflict with fcitx to keep old IMF for people who update from SLE-12 SP0 to SP1. -%if !0%{?is_opensuse} -Conflicts: fcitx -%endif %description IBus, short for Intelligent Input Bus, is an input framework. IBus @@ -201,11 +196,9 @@ sed -i 1i"SYS_LIB=%{_lib}" xim.d-ibus-121 cp -r %{SOURCE10} . cp -r %{SOURCE11} . -%if !0%{?is_opensuse} %patch10 -p1 %patch11 -p1 %patch12 -p1 -%endif %patch13 -p1 %patch14 -p1 %patch15 -p1