From 2f5b08236ecbc07fd85b86fcebe6573a83f1e729 Mon Sep 17 00:00:00 2001
From: Takao Fujiwara <tfujiwar@redhat.com>
Date: Sat, 13 Jul 2024 11:28:40 +0900
Subject: [PATCH] Update required packages in CI

- adobe-source-code-pro-fonts is no longer available in CI
- dnf and git do not work in CI after systemd-oomd-defaults is installed
---
 ibus.spec                                            |  6 +++++-
 tests/roles/ibus-desktop-testing-role/tasks/main.yml | 11 +++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/ibus.spec b/ibus.spec
index 448ac25..0d9249c 100644
--- a/ibus.spec
+++ b/ibus.spec
@@ -61,7 +61,7 @@
 Name:           ibus
 Version:        1.5.30
 # https://github.com/fedora-infra/rpmautospec/issues/101
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        Intelligent Input Bus for Linux OS
 License:        LGPL-2.1-or-later
 URL:            https://github.com/ibus/%name/wiki
@@ -634,6 +634,10 @@ dconf update || :
 %{_datadir}/installed-tests/ibus
 
 %changelog
+* Sat Jul 13 2024 Takao Fujiwara <tfujiwar@redhat.com> - 1.5.30-8
+- adobe-source-code-pro-fonts is no longer available in CI
+- dnf and git do not work in CI after systemd-oomd-defaults is installed
+
 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.5.30-7
 - Bump release for June 2024 mass rebuild
 
diff --git a/tests/roles/ibus-desktop-testing-role/tasks/main.yml b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
index b89c23a..7792d27 100644
--- a/tests/roles/ibus-desktop-testing-role/tasks/main.yml
+++ b/tests/roles/ibus-desktop-testing-role/tasks/main.yml
@@ -32,7 +32,6 @@
             - nautilus
             - polkit
             # default
-            - adobe-source-code-pro-fonts
             - at-spi2-atk
             - at-spi2-core
             - avahi
@@ -74,7 +73,7 @@
             - PackageKit-command-not-found
             - PackageKit-gtk3-module
             - sane-backends-drivers-scanners
-            - systemd-oomd-defaults
+            # Move systemd-oomd-defaults to Post-Installing section
             - tracker
             - tracker-miners
             - xdg-desktop-portal
@@ -85,6 +84,7 @@
       when: fedora_desktop.stat.exists == true
       package:
           name:
+            - adobe-source-code-pro-fonts
             - gnome-screenshot
             - gnome-boxes
             - yelp
@@ -139,6 +139,13 @@
       args:
           chdir: gnome-desktop-testing
 
+    - name: Post-Installing common GNOME desktop components
+      package:
+          name:
+            # TODO: DNS no longer works after install packages in this section
+            # so dnf and git should be done before this section
+            - systemd-oomd-defaults
+
     - name: Configure GNOME installed-tests testing harness build
       when: fedora_desktop.stat.exists == false
       command: ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var