Accepting request 503386 from home:qzhao:branches:M17N

Format the SPEC file and changelog to satisfy openSUSE packaging requirements.

OBS-URL: https://build.opensuse.org/request/show/503386
OBS-URL: https://build.opensuse.org/package/show/M17N/ibus?expand=0&rev=165
This commit is contained in:
2017-06-13 20:24:05 +00:00
committed by Git OBS Bridge
parent ced48654c0
commit 88c668b7aa
2 changed files with 58 additions and 52 deletions

View File

@@ -45,7 +45,7 @@ Source11: ibus-autostart.desktop
Source99: baselibs.conf
# PATCH-FIX-OPENSUSE ibus-python-install-dir.patch ftake@geeko.jp
Patch0: ibus-python-install-dir.patch
# PATFH-FIX-SUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwa@suse.de -- Fix lost XIM input after screenlock
# PATFH-FIX-OPENSUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwai@suse.de -- Fix lost XIM input after screenlock
Patch4: ibus-xim-fix-re-focus-after-lock.patch
# PATCH-FIX-UPSTREAM marguerite@opensuse.org
# Ibus will use python3 only when variable PYTHON2 is empty.
@@ -66,7 +66,8 @@ 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-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bsc#1036729 qzhao@suse.com -- Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
# PATCH-FIX-SLE ibus-disable-engines-preload-in-GNOME.patch bnc#1036729 qzhao@suse.com
# Disable ibus engines preload in GNOME for These works are handled by gnome-shell.
Patch12: ibus-disable-engines-preload-in-GNOME.patch
BuildRequires: dbus-1-glib-devel
BuildRequires: dbus-1-python-devel >= 0.83.0
@@ -105,7 +106,6 @@ BuildRequires: pkgconfig(vapigen)
%if %{with_wayland}
BuildRequires: pkgconfig(wayland-client) >= 1.2.0
%endif
# BuildRequires: nodejs-emojione
BuildRequires: pkgconfig(xkbcommon)
# copy_deep method is supported since 0.31.1
BuildRequires: vala >= 0.31.1
@@ -118,7 +118,9 @@ 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
# 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