From 91434db0a422395474f6e8d45452cfe19692950c Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Apr 24 2024 18:23:48 +0000
Subject: F41: Replace dnf with dnf5 in core, phosh-desktop, workstation-product


This change was originally slated for F39 but was delayed to F41.

Replaces dnf with dnf5 in core, phosh-desktop, workstation-product, and
replace dnf-plugins-core with dnf5-plugins. Add dnf5-plugins to
phosh-desktop; it's only an additional mebibyte and has a lot of
functionality.

DNF 5 is the new package manager which should replace DNF and microdnf
in Fedora 41+. See
https://fedoraproject.org/wiki/Changes/ReplaceDnfWithDnf5.

Signed-off-by: Evan Goode <mail@evangoo.de>

---

diff --git a/comps-f41.xml.in b/comps-f41.xml.in
index 547593e..1d2ec51 100644
--- a/comps-f41.xml.in
+++ b/comps-f41.xml.in
@@ -676,7 +676,7 @@
       <packagereq type="mandatory">coreutils</packagereq>
       <packagereq type="mandatory">curl</packagereq>
       <packagereq type="mandatory">dhcp-client</packagereq>
-      <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">dnf5</packagereq>
       <packagereq type="mandatory">e2fsprogs</packagereq>
       <packagereq type="mandatory">filesystem</packagereq>
       <packagereq type="mandatory">glibc</packagereq>
@@ -704,7 +704,7 @@
       <packagereq type="mandatory">util-linux</packagereq>
       <packagereq type="mandatory">vim-minimal</packagereq>
       <packagereq type="mandatory">yum</packagereq>
-      <packagereq type="default">dnf-plugins-core</packagereq>
+      <packagereq type="default">dnf5-plugins</packagereq>
       <packagereq type="default">dracut-config-rescue</packagereq>
       <packagereq type="default">firewalld</packagereq>
       <packagereq type="default">fwupd</packagereq>
@@ -4219,7 +4219,8 @@
       <packagereq arch="aarch64,s390x,x86_64">chatty</packagereq>
       <packagereq>cryptsetup</packagereq>
       <packagereq>default-editor</packagereq>
-      <packagereq>dnf</packagereq>
+      <packagereq>dnf5</packagereq>
+      <packagereq>dnf5-plugins</packagereq>
       <packagereq>epiphany</packagereq>
       <packagereq>feedbackd</packagereq>
       <packagereq>gnome-calculator</packagereq>
@@ -5432,7 +5433,7 @@
     <packagelist>
       <packagereq type="mandatory">amd-gpu-firmware</packagereq>
       <packagereq arch="x86_64" type="mandatory">amd-ucode-firmware</packagereq>
-      <packagereq type="mandatory">dnf</packagereq>
+      <packagereq type="mandatory">dnf5</packagereq>
       <packagereq type="mandatory">intel-gpu-firmware</packagereq>
       <packagereq type="mandatory">linux-firmware</packagereq>
       <packagereq arch="x86_64" type="mandatory">microcode_ctl</packagereq>
@@ -5461,7 +5462,7 @@
       <packagereq type="default">default-editor</packagereq>
       <packagereq type="default">deltarpm</packagereq>
       <packagereq type="default">desktop-backgrounds-gnome</packagereq>
-      <packagereq type="default">dnf-plugins-core</packagereq>
+      <packagereq type="default">dnf5-plugins</packagereq>
       <packagereq type="default">dos2unix</packagereq>
       <packagereq type="default">dosfstools</packagereq>
       <packagereq type="default">ethtool</packagereq>
@@ -5516,7 +5517,6 @@
       <packagereq type="default">policycoreutils-python-utils</packagereq>
       <packagereq type="default">psacct</packagereq>
       <packagereq type="default">psmisc</packagereq>
-      <packagereq type="default">python3-dnf-plugins-core</packagereq>
       <packagereq type="default">qadwaitadecorations-qt5</packagereq>
       <packagereq type="default">qt5-qtbase</packagereq>
       <packagereq type="default">qt5-qtbase-gui</packagereq>