From c6eac62b2ea8f69919535022992b0dcde0aa8e52 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 31 Mar 2025 19:25:27 -0700
Subject: [PATCH] Sync from Upstream (see notes)
The following comps have received changes
comps-rocky-10-lh.xml.in
---
comps-rocky-10-lh.xml | 2 --
comps-rocky-10-lh.xml.in | 10 ++--------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index d6e7b69..7a7bde9 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -2527,8 +2527,6 @@
<packagereq type="default">fwupd-devel</packagereq>
<packagereq type="default">gcc-plugin-devel</packagereq>
<packagereq type="default">gdbm-devel</packagereq>
- <packagereq type="default">gdk-pixbuf2-xlib</packagereq>
- <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
<packagereq type="default">gdm-devel</packagereq>
<packagereq type="default">gdm-pam-extensions-devel</packagereq>
<packagereq type="default">geoclue2-demos</packagereq>
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index 4252c1b..339d581 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -2041,9 +2041,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <rhel_only><packagereq type="optional">redhat-flatpak-preinstall-thunderbird</packagereq></rhel_only>
- <centos_only><packagereq type="optional">thunderbird</packagereq></centos_only>
- <rocky_only><packagereq type="optional">thunderbird</packagereq></rocky_only>
+ <packagereq type="optional">thunderbird</packagereq>
</packagelist>
</group>
<group variant="AppStream">
@@ -2053,9 +2051,7 @@
<default>false</default>
<uservisible>false</uservisible>
<packagelist>
- <rhel_only><packagereq>redhat-flatpak-preinstall-firefox</packagereq></rhel_only>
- <centos_only><packagereq>firefox</packagereq></centos_only>
- <rocky_only><packagereq>firefox</packagereq></rocky_only>
+ <packagereq>firefox</packagereq>
</packagelist>
</group>
<group variant="AppStream">
@@ -2724,8 +2720,6 @@
<packagereq type="default">fwupd-devel</packagereq>
<packagereq type="default">gcc-plugin-devel</packagereq>
<packagereq type="default">gdbm-devel</packagereq>
- <packagereq type="default">gdk-pixbuf2-xlib</packagereq>
- <packagereq type="default">gdk-pixbuf2-xlib-devel</packagereq>
<packagereq type="default">gdm-devel</packagereq>
<packagereq type="default">gdm-pam-extensions-devel</packagereq>
<packagereq type="default">geoclue2-demos</packagereq>
--
GitLab