Accepting request 365739 from home:qzhao:branches:M17N

porting SLE ibus patch to M17N project.

OBS-URL: https://build.opensuse.org/request/show/365739
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=148

ibus.spec

@@ -69,6 +69,15 @@ Patch7:         ibus-python3-migration.patch
 Patch8:         im-engines-precede-xkb.patch
 # PATCH-FIX-UPSTREAM ftake@geeko.jp
 Patch9:         ibus-fix-check-abs-icon-path-support.patch
+# PATCH-FIX-SLE hide-setup-menu.patch bnc#899259  qzhao@suse.com
+# ibus-setup should not launch from main menu.
+Patch10:        hide-setup-menu.patch
+# PATCH-FIX-SLE setup-switch-im.patch bnc#899259  qzhao@suse.com
+# switch to ibus when ibus not running.
+Patch11:        setup-switch-im.patch
+# PATCH-FEATURE-SLE ibus-adapt-new-vala.patch qzhao@suse.com
+# fix ibus compile error under new vala, for SLE Desktop 12 SP2.
+Patch12:        ibus-adapt-new-vala.patch
 BuildRequires:  dbus-1-glib-devel
 BuildRequires:  dbus-1-python-devel >= 0.83.0
 BuildRequires:  dconf-devel >= 0.7.5
@@ -118,6 +127,10 @@ Requires:       libibus-1_0-5 = %{version}
 # versions to 3.0 only.
 Requires:       typelib-1_0-Gtk-3_0
 Recommends:     %{name}-lang
+# PATCH-FEATURE-SLE Add conflict with fcitx FATE #319095 qzhao@suse.com -- Solve the problem for the people update from SP0 to SP1
+%if !0%{?is_opensuse}
+Conflicts:      fcitx
+%endif
 
 #Fix cursor following problem in KDE4 for libreoffice.
 %if 0%{?suse_version} != 1315
@@ -247,6 +260,12 @@ sed -i \
 %patch8 -p1
 %patch9 -p1
 
+%if !0%{?is_opensuse}
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%endif
+
 cp -r %{SOURCE2} .
 cp -r %{SOURCE3} .