[rpms/ibus] autotool: Disable ibus-panel rich condition in RHEL

[rpms/ibus] autotool: Disable ibus-panel rich condition in RHEL

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : 6ee90f280057fb09590ed19484cf1de689189d1c
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2024-07-29T19:55:54+09:00
Stats  : +2/-0 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/6ee90f280057fb09590ed19484cf1de689189d1c?branch=autotool

Log:
Disable ibus-panel rich condition in RHEL

---
diff --git a/ibus.spec b/ibus.spec
index 37d61e0..fa72e12 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -124,7 +124,9 @@ Requires:      (%{name}-gtk2%{?_isa}   = %{version}-%{release} if gtk2)
 %endif
 Requires:       %{name}-gtk3%{?_isa}   = %{version}-%{release}
 Requires:       %{name}-setup          = %{version}-%{release}
+%if 0%{?fedora}
 Requires:      (%{name}-panel%{?_isa}  = %{version}-%{release} if %ibus_panel_condition)
+%endif
 %if %{with xinit}
 Requires:      (%{name}-xinit          = %{version}-%{release} if %ibus_xinit_condition)
 %endif

[rpms/ibus] autotool: Disable ibus-panel rich condition in RHEL

[Takao Fujiwara]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 86f9167f276a21ff10f8cd1fbee3412c3aa0ddd8
            Author : Takao Fujiwara <tfujiwar@redhat.com>
            Date   : 2024-07-29T23:24:45+09:00
            Stats  : +5/-42 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/86f9167f276a21ff10f8cd1fbee3412c3aa0ddd8?branch=autotool

            Log:
            Disable ibus-panel rich condition in RHEL

- Delete ibus-xx-desktop-testing-mutter.patch

---
diff --git a/ibus-xx-desktop-testing-mutter.patch b/ibus-xx-desktop-testing-mutter.patch
deleted file mode 100644
index 08f6160..0000000
--- a/ibus-xx-desktop-testing-mutter.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From d63da885f8f4e3764b8b572347b70a0cefadc335 Mon Sep 17 00:00:00 2001
-From: fujiwarat <takao.fujiwara1@gmail.com>
-Date: Fri, 11 Feb 2022 11:43:57 +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
-@@ -45,7 +45,7 @@ TEST_LOG_STDOUT=0
- SCREEN_LOG=""
- HAVE_GRAPHICS=1
- VERBOSE=0
--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"
-@@ -81,9 +81,9 @@ usage()
- "-s, --srcdir=SOURCEDIR           Set the SOURCEDIR\n"                         \
- "-c, --no-graphics                Use Xvfb instead of Xorg\n"                  \
- "-V, --verbose                    Verbose log for ibus-daemon\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
-

diff --git a/ibus.spec b/ibus.spec
index fa72e12..c991683 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,7 +62,7 @@
 Name:           ibus
 Version:        1.5.31~beta1
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -74,10 +74,6 @@ Source3:        %{name}.conf.5
 Patch0:         %{name}-HEAD.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
 Patch1:         %{name}-1385349-segv-bus-proxy.patch
-%if 0%{?rhel} > 8
-# Use mutter window manager in RHEL CI
-Patch100:       %{name}-xx-desktop-testing-mutter.patch
-%endif
 
 # autoreconf requires autopoint but not po.m4
 BuildRequires:  gettext-devel
@@ -620,6 +616,10 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Mon Jul 29 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta1-11
+- Disable ibus-panel rich condition in RHEL
+- Delete ibus-xx-desktop-testing-mutter.patch
+
 * Sat Jul 27 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.31~beta1-10
 - Replace GNOME Xorg with GNOME Wayland in CI
 - Replace STI with TMT in CI