Resolves: #1995528 Bump to 1.5.25

.gitignore

@@ -59,3 +59,4 @@ ibus-1.3.6.tar.gz
 /ibus-1.5.22.tar.gz
 /ibus-1.5.23.tar.gz
 /ibus-1.5.24.tar.gz
+/ibus-1.5.25.tar.gz

ibus-xx-desktop-testing-mutter.patch

@@ -0,0 +1,37 @@
+From d63da885f8f4e3764b8b572347b70a0cefadc335 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Wed, 16 Jun 2021 20:55:20 +0900
+Subject: [PATCH] src/tests: Change window manager to mutter for RHEL
+
+---
+ src/tests/ibus-desktop-testing-runner.in | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/tests/ibus-desktop-testing-runner.in b/src/tests/ibus-desktop-testing-runner.in
+index 54b7e0d7..211e0da5 100755
+--- a/src/tests/ibus-desktop-testing-runner.in
++++ b/src/tests/ibus-desktop-testing-runner.in
+@@ -44,7 +44,7 @@ TEST_LOG="test-suite.log"
+ TEST_LOG_STDOUT=0
+ RESULT_LOG=""
+ HAVE_GRAPHICS=1
+-DESKTOP_COMMAND="dbus-launch --exit-with-session gnome-session"
++DESKTOP_COMMAND="dbus-launch --exit-with-session mutter"
+ PID_XORG=0
+ PID_GNOME_SESSION=0
+ TESTING_RUNNER="default"
+@@ -80,9 +80,9 @@ usage()
+ "-b, --builddir=BUILDDIR          Set the BUILDDIR\n"                          \
+ "-s, --srcdir=SOURCEDIR           Set the SOURCEDIR\n"                         \
+ "-c, --no-graphics                Use Xvfb instead of Xorg\n"                  \
+-"-d, --desktop=DESKTOP            Run DESTKTOP. The default is gnome-session.\n" \
++"-d, --desktop=DESKTOP            Run DESTKTOP. The default is mutter.\n" \
+ "                                 Suffix '-with-dbus' can run DESKTOP with dbus session." \
+-"                                 E.g. --desktop=mutter-with-dbus"             \
++"                                 E.g. --desktop=gnome-session-with-dbus"      \
+ "-t, --tests=\"TESTS...\"           Run TESTS programs which is separated by space\n" \
+ "-r, --runner=RUNNER              Run TESTS programs with a test RUNNER.\n"    \
+ "                                 RUNNDER = gnome or default.\n"               \
+-- 
+2.28.0
+

ibus.spec

@@ -37,8 +37,8 @@
 %global dbus_python_version 0.83.0
 
 Name:           ibus
-Version:        1.5.24
-Release:        8%{?dist}
+Version:        1.5.25
+Release:        1%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPLv2+
 URL:            https://github.com/ibus/%name/wiki
@@ -46,9 +46,12 @@ Source0:        https://github.com/ibus/%name/releases/download/%{version}/%{nam
 Source1:        %{name}-xinput
 Source2:        %{name}.conf.5
 # Patch0:         %%{name}-HEAD.patch
-Patch0:         %{name}-HEAD.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
 Patch1:         %{name}-1385349-segv-bus-proxy.patch
+%if 0%{?fedora:0}%{?rhel:1}
+# Use mutter window manager in RHEL CI
+Patch2:         %{name}-xx-desktop-testing-mutter.patch
+%endif
 
 BuildRequires:  gettext-devel
 BuildRequires:  libtool
@@ -244,6 +247,11 @@ The ibus-devel-docs package contains developer documentation for IBus
 %package desktop-testing
 Summary:        Wrapper of InstalledTests Runner for IBus
 Requires:       %{name} = %{version}-%{release}
+%if 0%{?fedora:1}%{?rhel:0}
+# Use no-overview mode in CI to get input focus
+BuildRequires:  gnome-shell-extension-no-overview
+Requires:       gnome-shell-extension-no-overview
+%endif
 BuildArch:      noarch
 
 %description desktop-testing
@@ -388,6 +396,7 @@ dconf update || :
 [ -x %{_bindir}/ibus ] && \
   %{_bindir}/ibus write-cache --system &>/dev/null || :
 
+
 %ldconfig_scriptlets libs
 
 %files -f %{name}10.lang
@@ -500,6 +509,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Aug 20 2021 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.25-1
+- Bump to 1.5.25. Related: rhbz#1995528
+
 * Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.5.24-8
 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
   Related: rhbz#1991688

sources

@@ -1 +1 @@
-SHA512 (ibus-1.5.24.tar.gz) = 25f34a51a5c85352e61699ca36bf7ddb9b486b28d71e15ce3a52b78bc9db2f8cb558049e0652fdc5431215a5f826fcb5a7d5e44f0de9a2ff746aaf60672e2f22
+SHA512 (ibus-1.5.25.tar.gz) = 4b8955a20a1e5a0daf61213817a9697874439866e235e6a7905f5994b145cd5a143e6cfc41f17204a828756baeb8edab70698596731ecebf7f1eea7cc5f36aa6