pool/ibus
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 503386 from home:qzhao:branches:M17N

Browse Source 
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:
Takashi Iwai 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ibus.changes
View File

@ -1,9 +1,9 @@
-------------------------------------------------------------------
Sat May 27 12:21:30 UTC 2017 - qzhao@suse.com
- Update ibus.spec file, copy auto-start files to SOURCE directory
- Update ibus.spec: copy auto-start files to SOURCE directory
to enable modifications before compile.
- Add ibus-disable-engines-preload-in-GNOME.patch, Disable load
- Add ibus-disable-engines-preload-in-GNOME.patch: Disable load
preload-engines actions in SLE, which is unnecessary for mono IMF
in SLE and may cause CJK user login failed (bsc#1036729).
@ -107,15 +107,15 @@ Wed Mar 23 10:29:32 UTC 2016 - fcrozat@suse.com
Mon Feb 28 17:59:28 CET 2016 - qzhao@suse.com
- Add ibus-adapt-new-vala.patch: Fix ibus compile error under
new vala compiler, for SLE Desktop 12 SP2. This patch is only
for SLED.
new vala compiler in SLE Desktop 12 SP2.
--------------------------------------------------------------------
Mon Feb 28 15:57:01 CET 2016 - qzhao@suse.com
- Add conflict to fcitx to fulfill FATE#319095
deprecate fcitx chinese input method in favor of ibus
(dummy bsc#933411). This modification is only for SLED.
- Update ibus.spec: Add "Conflicts: fcitx" tag in SLE,
This can help to keep old fcitx input-frame for people
who updated from SLE-12-SP0 to SP1, means to avoid the exception
which was brought by FATE#319095.
-------------------------------------------------------------------
Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
@ -125,16 +125,20 @@ Mon Feb 28 14:57:01 CET 2016 - sbrabec@suse.com
-------------------------------------------------------------------
Mon Feb 28 12:20:10 CET 2016 - qzhao@suse.com
- Add setup-switch-im.patch. Switch to ibus when ibus not
running.(bnc#899259). This patch is only for SLED.
- Add setup-switch-im.patch: In SLE, if user launch ibus-setup
without ibus service daemon running, it will warn the user and
switch current input-frame to ibus by setting an environment
variable. Note, the setting will make effect the next time this
user login to desktop (bsc#899259).
-------------------------------------------------------------------
Mon Feb 28 10:30:20 CET 2016 - qzhao@suse.com
- Add hide-setup-menu.patch
Make ibus-setup launch from indicator field.(bnc#899259)
Remove ibus-setup.desktop from main menu. This patch is only
for SLED.
- Add hide-setup-menu.patch: Remove ibus-setup.desktop entry in
SLE from desktop main menu, So it will only be launched from
desktop indicator field now.
This action is for insure ibus-setup runs with ibus-daemon in
background everytime (bsc#899259).
-------------------------------------------------------------------
Wed Feb 24 11:01:08 CET 2016 - tiwai@suse.de

10
ibus.spec
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