[rpms/ibus] autotool: Resolves #2342280 Fix ibus start with verbose typo

[rpms/ibus] autotool: Resolves #2342280 Fix ibus start with verbose typo

[Takao Fujiwara]

A new commit has been pushed.

Repo   : rpms/ibus
Branch : autotool
Commit : d3dc0f753e174a3a82adc67d778a99cc0c4e9d3b
Author : Takao Fujiwara <tfujiwar@redhat.com>
Date   : 2025-02-14T13:19:49+09:00
Stats  : +35/-3 in 2 file(s)
URL    : https://src.fedoraproject.org/rpms/ibus/c/d3dc0f753e174a3a82adc67d778a99cc0c4e9d3b?branch=autotool

Log:
Resolves #2342280 Fix ibus start with verbose typo

---
diff --git a/ibus-HEAD.patch b/ibus-HEAD.patch
index e69de29..b2111ae 100644
--- a/ibus-HEAD.patch
+++ b/ibus-HEAD.patch
@@ -0,0 +1,30 @@
+From 338968012c3869bc5ce9eac6733f430a3fc69c79 Mon Sep 17 00:00:00 2001
+From: fujiwarat <takao.fujiwara1@gmail.com>
+Date: Fri, 14 Feb 2025 12:59:41 +0900
+Subject: [PATCH] tools: Fix ibus start with verbose typo
+
+Fixes: https://github.com/ibus/ibus/commit/c5748e6
+BUG=rhbz#2342280
+---
+ tools/main.vala | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/tools/main.vala b/tools/main.vala
+index 3c0ea648..5716247d 100644
+--- a/tools/main.vala
++++ b/tools/main.vala
+@@ -259,8 +259,9 @@ bool start_daemon_in_wayland(bool     restart,
+                              string[] _argv) {
+ 
+     check_wayland_protocols();
+-    if (!is_wayland_session && verbose) {
+-        stderr.printf("Cannot find the Wayland input-method protocol.\n");
++    if (!is_wayland_session) {
++        if (verbose)
++            stderr.printf("Cannot find the Wayland input-method protocol.\n");
+         return false;
+     }
+ 
+-- 
+2.47.0
+

diff --git a/ibus.spec b/ibus.spec
index 1d245fa..146cc93 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -62,7 +62,7 @@
 Name:           ibus
 Version:        1.5.32~beta2
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -71,6 +71,7 @@ Source1:        https://github.com/ibus/%name/releases/download/%{source_version
 Source2:        %{name}-xinput
 Source3:        %{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
 
@@ -335,8 +336,6 @@ fi
 # cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || :
 # cp client/gtk2/ibusim.c client/gtk3/ibusim.c || :
 # cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || :
-cp client/gtk2/ibusimcontext.c client/gtk3/ibusimcontext.c || :
-cp client/gtk2/ibusimcontext.c client/gtk4/ibusimcontext.c || :
 
 
 # prep test
@@ -636,6 +635,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Fri Feb 14 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~beta2-2
+- Resolves #2342280 Fix ibus start with verbose typo
+
 * Fri Feb 07 2025 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.32~beta2-1
 - Implement compose key with Wayland input-method protocol
 - Implement %L in compose file for EN compose keys