From 28579a933787ef4066e028f47071184429442207 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 20 Nov 2024 20:04:06 -0500
Subject: [PATCH] Switch ELN to DNF5

DNF5 will provide a dnf symlink, and DNF-4 will be limited to its library,
which is still needed by other components not yet ported to libdnf5.

https://github.com/fedora-eln/eln/issues/201
https://github.com/rpm-software-management/dnf/pull/2161
https://github.com/rpm-software-management/dnf5/pull/1886
---
 configs/eln_extras_meta.yaml                        | 13 -------------
 ...cs_software_management-package-manager-dnf5.yaml |  9 +++++++++
 .../sst_cs_software_management-package-manager.yaml |  1 -
 3 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/configs/eln_extras_meta.yaml b/configs/eln_extras_meta.yaml
index 7210aad66..67ac6302e 100644
--- a/configs/eln_extras_meta.yaml
+++ b/configs/eln_extras_meta.yaml
@@ -17,10 +17,6 @@ data:
     - debian-keyring
     - debootstrap
     - difftastic
-    - dnf5
-    - dnf5-plugins
-    - dnf5daemon-client
-    - dnf5daemon-server
     - dpkg
     - drgn
     - duo_unix
@@ -37,9 +33,6 @@ data:
     - hyperfine
     - keyrings-filesystem
     - lei
-    - libdnf5
-    - libdnf5-cli
-    - libdnf5-plugin-actions
     - libdwarf
     - libdwarf-devel
     - libkdumpfile-devel
@@ -64,10 +57,6 @@ data:
     - pngquant
     - pore
     - pv
-    - python3-dnf-plugin-flunk_dependent_remove
-    - python3-libdnf5
-    - python3-libdnf5-cli
-    - python3-libdnf5-python-plugins-loader
     - python3-pystemd
     - python3-testslide
     - python3-zstd
@@ -76,8 +65,6 @@ data:
     - rpminspect-data-centos
     - rpminspect-data-fedora
     - rpmrebuild
-    - ruby-libdnf5
-    - ruby-libdnf5-cli
     - qrencode-devel
     - ragel
     - retsnoop
diff --git a/configs/sst_cs_software_management-package-manager-dnf5.yaml b/configs/sst_cs_software_management-package-manager-dnf5.yaml
index 25f122515..fb2e59322 100644
--- a/configs/sst_cs_software_management-package-manager-dnf5.yaml
+++ b/configs/sst_cs_software_management-package-manager-dnf5.yaml
@@ -6,8 +6,15 @@ data:
   maintainer: sst_cs_software_management
   packages:
     - dnf5
+    - dnf5-plugin-automatic
     - dnf5-plugins
+    - dnf5daemon-client
+    - dnf5daemon-server
+    - libdnf5-plugin-actions
     - librhsm
+    - python3-libdnf5
+    - python3-libdnf5-cli
+    - python3-libdnf5-python-plugins-loader
     - rpm
     - rpm-apidocs
     - rpm-cron
@@ -15,6 +22,8 @@ data:
     - rpm-plugin-selinux
     - rpm-plugin-syslog
     - rpm-plugin-systemd-inhibit
+    - ruby-libdnf5
+    - ruby-libdnf5-cli
     - scl-utils
   labels:
     - eln
diff --git a/configs/sst_cs_software_management-package-manager.yaml b/configs/sst_cs_software_management-package-manager.yaml
index d32935c48..4203ed378 100644
--- a/configs/sst_cs_software_management-package-manager.yaml
+++ b/configs/sst_cs_software_management-package-manager.yaml
@@ -23,5 +23,4 @@ data:
     - yum
     - yum-utils
   labels:
-    - eln
     - c10s