[rpms/ibus] autotool: Fix ELN build

[rpms/ibus] autotool: Fix ELN build

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 08ec0d5acd2e3eff70218203b6f67436399671c2
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-04-12T12:27:44-04:00
            Stats  : +1/-1 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/08ec0d5acd2e3eff70218203b6f67436399671c2?branch=autotool

            Log:
            Fix ELN build

A generally applicable Patch2 was added above the RHEL-specific
patch, and the same identifier may not be used twice.  Bump the
latter so it won't conflict with any additional patches.

---
diff --git a/ibus.spec b/ibus.spec
index 13d82dc..454f6f3 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -73,7 +73,7 @@ Patch2:         %{name}-2267615-wayland-init-keymap.patch
 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
+Patch100:       %{name}-xx-desktop-testing-mutter.patch
 %endif
 
 # autoreconf requires autopoint but not po.m4

[rpms/ibus] autotool: Fix ELN build

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/ibus
            Branch : autotool
            Commit : 3dc77d7066cc65d11f00f9571b9a906d1ff01c26
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2024-05-26T20:00:53-04:00
            Stats  : +0/-22 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/ibus/c/3dc77d7066cc65d11f00f9571b9a906d1ff01c26?branch=autotool

            Log:
            Fix ELN build

The affected code in 1.5.30 only calls setxkbmap if present.

---
diff --git a/ibus-xx-disable-setxkbmap.patch b/ibus-xx-disable-setxkbmap.patch
deleted file mode 100644
index fd08ec1..0000000
--- a/ibus-xx-disable-setxkbmap.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/src/tests/ibus-keypress.c b/src/tests/ibus-keypress.c
-index bab05398..41f16b98 100644
---- a/src/tests/ibus-keypress.c
-+++ b/src/tests/ibus-keypress.c
-@@ -272,12 +272,15 @@ create_window ()
- static void
- test_keypress (void)
- {
-+#if 0
-     int status = 0;
-     GError *error = NULL;
- 
-+    /* setxkbmap is not available in RHEL10 */
-     g_spawn_command_line_sync ("setxkbmap -layout us",
-                                NULL, NULL,
-                                &status, &error);
-+#endif
-     g_assert (register_ibus_engine ());
- 
-     create_window ();

diff --git a/ibus.spec b/ibus.spec
index 11057ce..273d97a 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -76,8 +76,6 @@ Patch1:         %{name}-1385349-segv-bus-proxy.patch
 %if %{without xinit}
 # Use mutter window manager in RHEL CI
 Patch100:       %{name}-xx-desktop-testing-mutter.patch
-# Disable to run setxkbmap
-Patch101:       %{name}-xx-disable-setxkbmap.patch
 %endif
 
 # autoreconf requires autopoint but not po.m4