From e9dddd694ca0b90676f29206cf294b3e0dc36afa Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Mon, 26 Jun 2023 03:08:54 +0000
Subject: [PATCH] F39: Replace dnf with dnf5 in core, phosh-desktop,
 workstation-product

Replaces dnf with dnf5 in core, phosh-desktop, workstation-product, and
replace dnf-plugins-core with dnf5-plugins.

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

DNF 5 does not yet implement DNF 4's system-upgrade plugin [0][1], so
python3-dnf-plugin-system-upgrade is kept in workstation-product, which
depends on python3-dnf.

Part of https://github.com/rpm-software-management/dnf5/issues/597.

[0] https://github.com/rpm-software-management/dnf5/issues/389
[1] https://github.com/rpm-software-management/dnf5/issues/258
---
 comps-f39.xml.in | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/comps-f39.xml.in b/comps-f39.xml.in
index 3b14e4ef..e910dad3 100644
--- a/comps-f39.xml.in
+++ b/comps-f39.xml.in
@@ -645,7 +645,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>
@@ -675,7 +675,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>
@@ -4383,7 +4383,7 @@
       <packagereq arch="aarch64,s390x,x86_64">chatty</packagereq>
       <packagereq>cryptsetup</packagereq>
       <packagereq>default-editor</packagereq>
-      <packagereq>dnf</packagereq>
+      <packagereq>dnf5</packagereq>
       <packagereq>epiphany</packagereq>
       <packagereq>feedbackd</packagereq>
       <packagereq>gnome-calculator</packagereq>
@@ -5594,7 +5594,7 @@
     <uservisible>false</uservisible>
     <packagelist>
       <packagereq type="mandatory">amd-gpu-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>
@@ -5623,7 +5623,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>