Accepting request 634517 from home:ftake:branches:M17N

- Upstream update to 1.5.19
  * IBUS_DISCARD_PASSWORD variable for the workaround of the
    password popup problem in Firefox and Chrome under GNOME X11
  * Emoji feature improvements:
    Move input focus on Emojier to engines' preedit
    Show previous emojis with "history" annotation
    Add num pad Enter, Down, Up, Left, Right on Emojier
    Fix SEGV in IBusEngine if no emoji shortcut keyis
  * Compose key feature:
    Enable preedit for compose keys
  * Bug fixes and code improvements
- Drop ibus-force-python3.patch
  * merged by upstream
- Remove ibus-python3
  * Upstream will not maintain it for Python 3 anymore
  * Drop ibus-python3-migration.patch
- Update version to 1.5.19
  * No update for this subpackage

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

ibus.spec

@@ -26,7 +26,7 @@
 %define with_emoji 0
 %endif
 Name:           ibus
-Version:        1.5.18
+Version:        1.5.19
 Release:        0
 Summary:        The "Intelligent Input Bus" input method
 License:        LGPL-2.1-or-later
@@ -44,14 +44,6 @@ Source99:       baselibs.conf
 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
 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.
-# Thus ibus-setup and bindings are still bytecompiled with python2.
-# Then python3 support is useless, so we force python3 when python3
-# is enabled, and fix syntax errors in python-config.py
-Patch5:         ibus-force-python3.patch
-# PATCH-FIX-UPSTREAM marguerite@opensuse.org
-Patch7:         ibus-python3-migration.patch
 # PATCH-FIX-UPSTREAM ftake@geeko.jp
 # Select an IM engine at the first login
 Patch8:         im-engines-precede-xkb.patch
@@ -164,14 +156,6 @@ Supplements:    packageand(ibus:gtk3)
 %description gtk3
 This package contains ibus im module for use by gtk3.
 
-%package -n python3-ibus
-Summary:        Python3 module for ibus
-Group:          Development/Languages/Python
-Requires:       %{name} = %{version}
-
-%description -n python3-ibus
-This package contains the python3 module for ibus
-
 %package devel
 Summary:        Development tools for ibus
 Group:          Development/Libraries/Other
@@ -192,8 +176,6 @@ docs for ibus.
 %setup -q
 %patch0 -p1
 %patch4 -p1
-%patch5 -p1
-%patch7 -p1
 %patch8 -p1
 %patch9 -p1
 
@@ -227,6 +209,7 @@ intltoolize -f
            --disable-appindicator \
 %endif
            --with-python=python3 \
+           --disable-python2 \
            --enable-python-library \
            --enable-introspection \
            --disable-gconf \
@@ -310,7 +293,8 @@ dconf update
 %{gtk3_immodule_postun}
 
 %files
-%doc AUTHORS COPYING README README.SUSE xim.ibus.suse.template
+%doc AUTHORS README README.SUSE xim.ibus.suse.template
+%license COPYING
 %config %{_sysconfdir}/rpm/macros.ibus
 %config %{_sysconfdir}/X11/xim.d/*
 %{_bindir}/ibus
@@ -336,6 +320,9 @@ dconf update
 %{_mandir}/man1/ibus.1%{ext_man}
 %{_mandir}/man1/ibus-daemon.1%{ext_man}
 %{_mandir}/man1/ibus-setup.1%{ext_man}
+%{_mandir}/man5/00-upstream-settings.5%{ext_man}
+%{_mandir}/man5/ibus.5%{ext_man}
+
 %if %{with_emoji}
 %{_datadir}/applications/org.freedesktop.IBus.Panel.Emojier.desktop
 %{_datadir}/applications/org.freedesktop.IBus.Panel.Extension.Gtk3.desktop
@@ -359,9 +346,6 @@ dconf update
 %files gtk3
 %{_libdir}/gtk-3.0/3.0.0/immodules/im-ibus.so
 
-%files -n python3-ibus
-%{python3_sitearch}/ibus
-
 %files devel
 %{_libdir}/libibus-1.0.so
 %{_includedir}/ibus-1.0