From 32fa796ae6064e02824666ea20c874bfa48b3b07 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Tue, 17 Sep 2024 10:24:15 +0900
Subject: [PATCH] tests: Update packages with comps-f41

- Add base-graphical
- Add fonts default
- Delete libcanberra-gtk3, libproxy-duktape
- Delete tmt for RHEL CI

Resolves: RHEL-58993
---
 .../install1-common/main.fmf                  | 40 ++++++++++++++-----
 .../install5-tmt/main.fmf                     |  1 -
 2 files changed, 31 insertions(+), 10 deletions(-)

diff --git a/tests/ibus-desktop-testing/install1-common/main.fmf b/tests/ibus-desktop-testing/install1-common/main.fmf
index d4d1a62..b920b02 100644
--- a/tests/ibus-desktop-testing/install1-common/main.fmf
+++ b/tests/ibus-desktop-testing/install1-common/main.fmf
@@ -7,9 +7,25 @@ require:
     - ibus
     - ibus-desktop-testing
     - dbus-x11
-    # https://pagure.io/fedora-comps/blob/main/f/comps-f38.xml.in
+    # https://pagure.io/fedora-comps/blob/main/f/comps-f41.xml.in
     # dnf group info GNOME
-    # mandatory
+    # base-graphical mandatory
+    - mesa-dri-drivers
+    - mesa-vulkan-drivers
+    - plymouth-system-theme
+    # fonts default
+    - default-fonts-cjk-mono
+    - default-fonts-cjk-sans
+    - default-fonts-cjk-serif
+    - default-fonts-core-emoji
+    - default-fonts-core-math
+    - default-fonts-core-mono
+    - default-fonts-core-sans
+    - default-fonts-core-serif
+    - default-fonts-other-mono
+    - default-fonts-other-sans
+    - default-fonts-other-serif
+    # gnome-desktop mandatory
     - dconf
     - gdm
     - gnome-connections
@@ -22,9 +38,8 @@ require:
     - gnome-text-editor
     - nautilus
     - polkit
-    # default
-    - at-spi2-atk
-    - at-spi2-core
+    - ptyxis
+    # gnome-desktop default
     - avahi
     - baobab
     # Sometimes version mismatch with gnome-shell in rawhide
@@ -32,33 +47,34 @@ require:
     - fprintd-pam
     - glib-networking
     - gnome-bluetooth
+    - gnome-browser-connector
     - gnome-calculator
+    - gnome-calendar
     - gnome-characters
     - gnome-classic-session
     - gnome-clocks
     - gnome-color-manager
     - gnome-disk-utility
+    - gnome-epub-thumbnailer
     - gnome-font-viewer
     - gnome-remote-desktop
     - gnome-system-monitor
     - gnome-user-docs
     - gvfs-goa
     - gvfs-mtp
-    - libcanberra-gtk3
-    - libproxy-duktape
     - librsvg2
     - libsane-hpaio
+    - loupe
     - mesa-dri-drivers
     - mesa-libEGL
     - ModemManager
     - NetworkManager-adsl
     - NetworkManager-ppp
     - NetworkManager-wwan
-    - orca
     - PackageKit-command-not-found
     - PackageKit-gtk3-module
-    - ptyxis
     - sane-backends-drivers-scanners
+    - snapshot
     # Move systemd-oomd-defaults to Post-Installing section
     - tracker
     - tracker-miners
@@ -66,3 +82,9 @@ require:
     - xdg-desktop-portal-gnome
     - xdg-desktop-portal-gtk
     - xdg-user-dirs-gtk
+    # desktop-accessibility default
+    - at-spi2-atk
+    - at-spi2-core
+    - brltty
+    - orca
+    - speech-dispatcher
diff --git a/tests/ibus-desktop-testing/install5-tmt/main.fmf b/tests/ibus-desktop-testing/install5-tmt/main.fmf
index 966cf80..332864f 100644
--- a/tests/ibus-desktop-testing/install5-tmt/main.fmf
+++ b/tests/ibus-desktop-testing/install5-tmt/main.fmf
@@ -3,4 +3,3 @@ description:
     The test script is calling the beakerlib script.
 require:
     - beakerlib
-    - tmt