diff --git a/ibus.changes b/ibus.changes index 4f6bd89..8d85ac7 100644 --- a/ibus.changes +++ b/ibus.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Apr 15 06:18:12 UTC 2020 - Cliff Zhao + +- Update ibus.spec: Drop the is_opensuse macro to + eliminate in behavior in between SLE-15 and openSUSE-Leap. + ------------------------------------------------------------------- Wed Mar 11 10:56:35 UTC 2020 - Antonio Larrosa diff --git a/ibus.spec b/ibus.spec index 5b5906f..fcdb9a2 100644 --- a/ibus.spec +++ b/ibus.spec @@ -1,7 +1,7 @@ # # spec file for package ibus # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,13 +16,8 @@ # -%if 0%{?is_opensuse} || 0%{?sle_version} >= 150200 %define with_wayland 1 %define with_emoji 1 -%else -%define with_wayland 0 -%define with_emoji 0 -%endif Name: ibus Version: 1.5.22 @@ -41,7 +36,8 @@ 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-OPENSUSE ibus-xim-fix-re-focus-after-lock.patch bnc#874869 tiwai@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 ftake@geeko.jp # Select an IM engine at the first login @@ -58,7 +54,8 @@ Patch11: setup-switch-im.patch # 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 -# PATCH-FIX-UPSTREAM alarrosa@suse.com -- Remove unnecessary qt5 dependency https://github.com/ibus/ibus/pull/2194 +# PATCH-FIX-UPSTREAM alarrosa@suse.com +# Remove unnecessary qt5 dependency https://github.com/ibus/ibus/pull/2194 Patch13: 0001-Replace-the-Qt-check-for-appindicator-engine-icon-wi.patch BuildRequires: fdupes BuildRequires: gettext-devel diff --git a/python-ibus.spec b/python-ibus.spec index 2139163..dcd17d2 100644 --- a/python-ibus.spec +++ b/python-ibus.spec @@ -1,7 +1,7 @@ # # spec file for package python-ibus # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed