From e6d7a28d41671c03a2b60945f7d4dd838a25c29c Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Tue, 17 Dec 2024 18:48:02 -0700
Subject: [PATCH] sync from upstream
---
comps-rocky-10-lh.xml | 8 +++++---
comps-rocky-10-lh.xml.in | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/comps-rocky-10-lh.xml b/comps-rocky-10-lh.xml
index 58d8d80..28fbf07 100644
--- a/comps-rocky-10-lh.xml
+++ b/comps-rocky-10-lh.xml
@@ -372,7 +372,6 @@
<packagereq variant="AppStream" arch="aarch64,ppc64le,x86_64">gnome-bluetooth</packagereq>
<packagereq variant="AppStream">gnome-calculator</packagereq>
<packagereq variant="AppStream">gnome-characters</packagereq>
- <packagereq variant="AppStream">gnome-classic-session</packagereq>
<packagereq variant="AppStream" arch="ppc64le,x86_64">gnome-color-manager</packagereq>
<packagereq variant="AppStream">gnome-disk-utility</packagereq>
<packagereq variant="AppStream">gnome-font-viewer</packagereq>
@@ -412,6 +411,8 @@
<packagereq variant="AppStream">orca</packagereq>
<packagereq variant="AppStream">PackageKit-command-not-found</packagereq>
<packagereq variant="AppStream">PackageKit-gtk3-module</packagereq>
+ <packagereq variant="AppStream">papers</packagereq>
+ <packagereq variant="AppStream">plymouth-system-theme</packagereq>
<packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
<packagereq variant="AppStream">rocky-backgrounds</packagereq>
<packagereq variant="AppStream">tracker</packagereq>
@@ -1580,7 +1581,6 @@
<packagereq>texlive-pdftex</packagereq>
<packagereq>texlive-tex</packagereq>
<packagereq>texlive-tex4ht</packagereq>
- <packagereq>texlive-xdvi</packagereq>
<packagereq>texlive-xetex</packagereq>
</packagelist>
</group>
@@ -1770,7 +1770,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="optional">freerdp</packagereq>
- <packagereq type="optional">gnome-connections</packagereq>
+ <packagereq type="default">gnome-connections</packagereq>
</packagelist>
</group>
<group>
@@ -2632,6 +2632,7 @@
<packagereq type="default">libfdt-static</packagereq>
<packagereq type="default">libfido2-devel</packagereq>
<packagereq type="default">libfontenc-devel</packagereq>
+ <packagereq type="default">libfprint-devel</packagereq>
<packagereq type="default">libgee-devel</packagereq>
<packagereq type="default">libgexiv2-devel</packagereq>
<packagereq type="default">libgphoto2-devel</packagereq>
@@ -3644,6 +3645,7 @@
<packagereq type="default">gnome-shell-extension-no-overview</packagereq>
<packagereq type="default">zlib-ng</packagereq>
<packagereq type="default">zlib-ng-devel</packagereq>
+ <packagereq type="default">yggdrasil-devel</packagereq>
</packagelist>
</group>
<environment variant="BaseOS">
diff --git a/comps-rocky-10-lh.xml.in b/comps-rocky-10-lh.xml.in
index c50886d..99c7561 100644
--- a/comps-rocky-10-lh.xml.in
+++ b/comps-rocky-10-lh.xml.in
@@ -375,7 +375,6 @@
<packagereq arch="aarch64,ppc64le,x86_64" variant="AppStream">gnome-bluetooth</packagereq>
<packagereq variant="AppStream">gnome-calculator</packagereq>
<packagereq variant="AppStream">gnome-characters</packagereq>
- <packagereq variant="AppStream">gnome-classic-session</packagereq>
<packagereq arch="ppc64le,x86_64" variant="AppStream">gnome-color-manager</packagereq>
<packagereq variant="AppStream">gnome-disk-utility</packagereq>
<packagereq variant="AppStream">gnome-font-viewer</packagereq>
@@ -415,6 +414,8 @@
<packagereq variant="AppStream">orca</packagereq>
<packagereq variant="AppStream">PackageKit-command-not-found</packagereq>
<packagereq variant="AppStream">PackageKit-gtk3-module</packagereq>
+ <packagereq variant="AppStream">papers</packagereq>
+ <packagereq variant="AppStream">plymouth-system-theme</packagereq>
<packagereq variant="AppStream">sane-backends-drivers-scanners</packagereq>
<rhel_only><packagereq variant="AppStream">redhat-backgrounds</packagereq></rhel_only>
<rocky_only><packagereq variant="AppStream">rocky-backgrounds</packagereq></rocky_only>
@@ -1593,7 +1594,6 @@
<packagereq>texlive-pdftex</packagereq>
<packagereq>texlive-tex</packagereq>
<packagereq>texlive-tex4ht</packagereq>
- <packagereq>texlive-xdvi</packagereq>
<packagereq>texlive-xetex</packagereq>
</packagelist>
</group>
@@ -1794,7 +1794,7 @@
<uservisible>false</uservisible>
<packagelist>
<packagereq type="optional">freerdp</packagereq>
- <packagereq type="optional">gnome-connections</packagereq>
+ <packagereq type="default">gnome-connections</packagereq>
</packagelist>
</group>
<group>
@@ -2825,6 +2825,7 @@
<packagereq type="default">libfdt-static</packagereq>
<packagereq type="default">libfido2-devel</packagereq>
<packagereq type="default">libfontenc-devel</packagereq>
+ <packagereq type="default">libfprint-devel</packagereq>
<packagereq type="default">libgee-devel</packagereq>
<packagereq type="default">libgexiv2-devel</packagereq>
<packagereq type="default">libgphoto2-devel</packagereq>
@@ -3838,6 +3839,7 @@
<centos_only><packagereq type="default">centos-sb-certs</packagereq></centos_only>
<packagereq type="default">zlib-ng</packagereq>
<packagereq type="default">zlib-ng-devel</packagereq>
+ <packagereq type="default">yggdrasil-devel</packagereq>
</packagelist>
</group>
<environment variant="BaseOS">
--
GitLab