Merge branch 'f40' into f40-c10s

ibus.spec

@@ -61,7 +61,7 @@
 Name:           ibus
 Version:        1.5.30
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -74,11 +74,11 @@ Source3:        %{name}.conf.5
 Patch1:         %{name}-2267615-wayland-init-keymap.patch
 # Under testing #1349148 #1385349 #1350291 #1406699 #1432252 #1601577
 Patch2:         %{name}-1385349-segv-bus-proxy.patch
-%if 0%{?fedora:0}%{?rhel:1}
+%if %{without xinit}
 # Use mutter window manager in RHEL CI
 Patch100:       %{name}-xx-desktop-testing-mutter.patch
 # Disable to run setxkbmap
-Patch101:       %{name}-xx-el10n.patch
+Patch101:       %{name}-xx-disable-setxkbmap.patch
 %endif
 
 # autoreconf requires autopoint but not po.m4
@@ -139,8 +139,6 @@ Requires:       python3-gobject
 %if %{with xinit}
 # Owner of %%{_sysconfdir}/X11/xinit
 Requires:       xorg-x11-xinit
-%endif
-%if 0%{?fedora:1}%{?rhel:0}
 Requires:       setxkbmap
 %endif
 %if (0%{?fedora} > 29 || 0%{?rhel} > 8)
@@ -270,7 +268,7 @@ Summary:        IBus Panel icon
 Requires:       %{name}%{?_isa}        = %{version}-%{release}
 Requires:       %{name}-libs%{?_isa}   = %{version}-%{release}
 %if %{without xinit}
-Requires:       %{name}-xinit          = %{version}-%{release}
+# ibus-xinit is not available in RHEL
 %endif
 BuildRequires:  libdbusmenu-gtk3-devel
 
@@ -409,7 +407,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-3.0/%{gtk3_binary_version}/immodules/im-ibus
 %if %{with gtk4}
 rm -f $RPM_BUILD_ROOT%{_libdir}/gtk-4.0/%{gtk4_binary_version}/immodules/libim-ibus.la
 %endif
-%if 0%{?fedora:0}%{?rhel:1}
+%if %{without xinit}
 # setxkbmap is not available in RHEL10
 rm -f $RPM_BUILD_ROOT%{_datadir}/installed-tests/ibus/xkb-latin-layouts.test
 %endif
@@ -628,6 +626,9 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Tue May 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-4
+- Disable ibus-xinit dependency of ibus-panel
+
 * Tue May 14 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-3
 - Install git in CI
 

tests/roles/ibus-desktop-testing-role/tasks/main.yml

@@ -4,36 +4,15 @@
   stat:
       path: "/etc/fedora-release"
 
-- name: Result1
-  debug:
-    msg: "{{ fedora_desktop }}"
-
-- name: Check if GNOME installed-tests testing harness is installed
-  register: gnome_desktop_testing_runner
-  find:
-      paths: "{{ ansible_env.PATH.split(':') }}"
-      pattern: gnome-desktop-testing-runner
-
 - name: Build and install GNOME installed-tests testing harness
   block:
-    #- name: Installing GNOME installed-tests testing harness
-    #  when: gnome_desktop_testing_runner.matched == 0
-    #  package:
-    #      name:
-    #        - gnome-desktop-testing
     - name: Installing common GNOME desktop components
       package:
           name:
             # IBus CI sets
             - xorg-x11-server-Xvfb
-            - autoconf
-            - automake
-            - make
-            - gcc
-            - git
             - ibus
             - ibus-desktop-testing
-            - libtool
             - dbus-x11
             # https://pagure.io/fedora-comps/blob/main/f/comps-f38.xml.in
             # dnf group info GNOME
@@ -131,29 +110,49 @@
             - simple-scan
             - sushi
             - totem
+    - name: Installing GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == true
+      package:
+          name:
+            - gnome-desktop-testing
+    - name: Installing build environment
+      when: fedora_desktop.stat.exists == false
+      package:
+          name:
+            - autoconf
+            - automake
+            - make
+            - gcc
+            - git
+            - libtool
 
     - name: Fetching GNOME installed-tests testing harness source from remote repository
+      when: fedora_desktop.stat.exists == false
       git:
           repo: 'https://gitlab.gnome.org/GNOME/gnome-desktop-testing.git'
           dest: gnome-desktop-testing
           force: yes
 
     - name: Checkout v2021.1 tag in GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
       command: git checkout -b v2021.1 refs/tags/v2021.1
       args:
           chdir: gnome-desktop-testing
 
     - name: Configure GNOME installed-tests testing harness build
+      when: fedora_desktop.stat.exists == false
       command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
       args:
           chdir: gnome-desktop-testing
 
     - name: Build GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
       command: make
       args:
           chdir: gnome-desktop-testing
 
     - name: Install GNOME installed-tests testing harness
+      when: fedora_desktop.stat.exists == false
       command: make install
       args:
           chdir: gnome-desktop-testing