From e93aac68837d1f5c3b9da02865787a26db8bf78246d242f06477518127fd2afa Mon Sep 17 00:00:00 2001
From: Hillwood Yang <hillwoodroc@gmail.com>
Date: Mon, 28 Sep 2020 04:06:38 +0000
Subject: [PATCH] Accepting request 836538 from home:qzhao:branches:M17N

Update ibus.spec: Drop the is_opensuse macro to eliminate the difference between SLE-15 and openSUSE-Leap (jsc#SLE-12084).

OBS-URL: https://build.opensuse.org/request/show/836538
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=238
---
 ibus.changes | 6 ++++++
 ibus.spec    | 7 -------
 2 files changed, 6 insertions(+), 7 deletions(-)

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 <qzhao@suse.com>
+
+- 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 <qkzhu@suse.com>
 
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