From 952a5c1986ebcf303fe86b0713696a5305a22923 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Wed, 20 Sep 2023 18:00:42 +0000
Subject: [PATCH 1/2] [spec] Remove /etc/dnf/protected.d/dnf.conf

Instead, hardcode the protection of dnf in libdnf. This way, DNF 5 will
be able to uninstall DNF 4.

= changelog =
msg: Allow dnf to be removed by DNF 5
type: enhancement
---
 dnf.spec                           | 1 -
 etc/dnf/protected.d/CMakeLists.txt | 2 +-
 etc/dnf/protected.d/dnf.conf       | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)
 delete mode 100644 etc/dnf/protected.d/dnf.conf

diff --git a/dnf.spec b/dnf.spec
index 95d93775ea..db06f68a0a 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -302,7 +302,6 @@ popd
 # If DNF5 does not obsolete DNF ownership of dnf.conf should be DNF's
 %config(noreplace) %{confdir}/%{name}.conf
 %endif
-%config(noreplace) %{confdir}/protected.d/%{name}.conf
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %ghost %attr(644,-,-) %{_localstatedir}/log/hawkey.log
 %ghost %attr(644,-,-) %{_localstatedir}/log/%{name}.log
diff --git a/etc/dnf/protected.d/CMakeLists.txt b/etc/dnf/protected.d/CMakeLists.txt
index d368f146ef..b833c9bc63 100644
--- a/etc/dnf/protected.d/CMakeLists.txt
+++ b/etc/dnf/protected.d/CMakeLists.txt
@@ -1 +1 @@
-INSTALL (FILES "dnf.conf" "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
+INSTALL (FILES "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
diff --git a/etc/dnf/protected.d/dnf.conf b/etc/dnf/protected.d/dnf.conf
deleted file mode 100644
index 6148f6c965..0000000000
--- a/etc/dnf/protected.d/dnf.conf
+++ /dev/null
@@ -1 +0,0 @@
-dnf

From 87bd3056de4cf5108de963deb5222e0d563f5a37 Mon Sep 17 00:00:00 2001
From: Evan Goode <mail@evangoo.de>
Date: Thu, 21 Sep 2023 18:11:46 +0000
Subject: [PATCH 2/2] [spec] Bump version and depend on libdnf 0.71.1

Require new version of libdnf so that dnf remains a protected package,
see https://github.com/rpm-software-management/libdnf/pull/1621.
---
 VERSION.cmake | 2 +-
 dnf.spec      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/VERSION.cmake b/VERSION.cmake
index a2f5d509f4..797d17d3d4 100644
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -1,4 +1,4 @@
-set (DEFAULT_DNF_VERSION "4.17.0")
+set (DEFAULT_DNF_VERSION "4.17.1")
 
 if(DEFINED DNF_VERSION)
   if(NOT ${DEFAULT_DNF_VERSION} STREQUAL ${DNF_VERSION})
diff --git a/dnf.spec b/dnf.spec
index db06f68a0a..e4edb77aac 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -2,7 +2,7 @@
 %define __cmake_in_source_build 1
 
 # default dependencies
-%global hawkey_version 0.71.0
+%global hawkey_version 0.71.1
 %global libcomps_version 0.1.8
 %global libmodulemd_version 2.9.3
 %global rpm_version 4.18.0
@@ -67,7 +67,7 @@
 It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
-Version:        4.17.0
+Version:        4.17.1
 Release:        1%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING