From 26baabb3e0402bd1e45c94a7ebbcfaeb4b371a18 Mon Sep 17 00:00:00 2001
From: Mike FABIAN <mfabian@redhat.com>
Date: Tue, 9 Jul 2024 18:03:48 +0200
Subject: [PATCH] Resolves: RHEL-36633 Do not require gnome-session,
 gnome-shell, gnome-desktop-testing, ibus-desktop-testing,
 gnome-shell-extension-no-overview for the CI test

The current CI test does not need these at all, they were only
required for the old test which used ibus-desktop-testing-runner and
Xvfb, gnome-shell-extension-no-overview seems unavailable on c10s and
that makes the CI test fail for no reason.

Also: Update to 2.25.12

- Correct calculation of caret when a key which triggered a commit *increases* the length of the transliteration
  (Resolves: https://github.com/mike-fabian/ibus-typing-booster/issues/519)
- Do the retransliteration of the input_phrase currently only when the cursor is at the end of the typed string
---
 .gitignore               |  1 +
 ibus-typing-booster.spec |  2 +-
 sources                  |  2 +-
 tests/main.fmf           | 10 +++++-----
 tests/runtest.sh         |  6 +++---
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index b0c8417..e674398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -339,3 +339,4 @@
 /ibus-typing-booster-2.25.9.tar.gz
 /ibus-typing-booster-2.25.10.tar.gz
 /ibus-typing-booster-2.25.11.tar.gz
+/ibus-typing-booster-2.25.12.tar.gz
diff --git a/ibus-typing-booster.spec b/ibus-typing-booster.spec
index cb57625..7019dce 100644
--- a/ibus-typing-booster.spec
+++ b/ibus-typing-booster.spec
@@ -1,5 +1,5 @@
 Name:       ibus-typing-booster
-Version:    2.25.11
+Version:    2.25.12
 Release:    %autorelease
 Summary:    A completion input method
 License:    GPL-3.0-or-later AND Apache-2.0
diff --git a/sources b/sources
index 95e4c0d..e99afbc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ibus-typing-booster-2.25.11.tar.gz) = 97137a0ad68b96c7a4bbd560f916e1f42f4ee191f867967a35ac52031d48940d1942d4bdcad7d08a0430f8cdc32232c82042460b8fe819c313fc96c72df73db6
+SHA512 (ibus-typing-booster-2.25.12.tar.gz) = 0626e9bf067703c90d9879f1fd7cbaa302e6423c4f54f37a50ca7015d96708611fc3b6d0d2465acab68846e26e0976ab8ea9b2557fd2da481c3dd0bf211e69c2
diff --git a/tests/main.fmf b/tests/main.fmf
index fdc34ed..9a0b95c 100644
--- a/tests/main.fmf
+++ b/tests/main.fmf
@@ -14,16 +14,16 @@ require:
 #  - libtool
 #  - glib2-devel
 #  - systemd-devel
-  - gnome-session
-  - gnome-shell
-  - gnome-shell-extension-no-overview
+#  - gnome-session
+#  - gnome-shell
+#  - gnome-shell-extension-no-overview
   - dbus-x11
   - xorg-x11-server-Xwayland
   - xwayland-run
   - ibus
   - ibus-devel
-  - ibus-desktop-testing
-  - gnome-desktop-testing
+#  - ibus-desktop-testing
+#  - gnome-desktop-testing
   - ibus-typing-booster
   - ibus-typing-booster-tests
   - python3-packaging
diff --git a/tests/runtest.sh b/tests/runtest.sh
index 87fb7ec..06356a6 100755
--- a/tests/runtest.sh
+++ b/tests/runtest.sh
@@ -7,9 +7,9 @@ XFWB_SCRIPT=$(pwd)/xwfb-script.sh
 rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm ibus-typing-booster
-        rlAssertRpm gnome-desktop-testing
-        rlAssertRpm gnome-shell-extension-no-overview
-        rlAssertBinaryOrigin gnome-desktop-testing-runner gnome-desktop-testing
+#        rlAssertRpm gnome-desktop-testing
+#        rlAssertRpm gnome-shell-extension-no-overview
+#        rlAssertBinaryOrigin gnome-desktop-testing-runner gnome-desktop-testing
         rlRun "tmp=\$(mktemp -d)" 0 "Create tmp directory"
         rlRun "pushd $tmp"
     rlPhaseEnd