[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.
rpm-software-management · Sep 20, 2023 · 051fd22 · 051fd22
1 parent 2d2047e
commit 051fd22
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git 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
@@ -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
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		INSTALL (FILES "dnf.conf" "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)
		INSTALL (FILES "yum.conf" DESTINATION ${SYSCONFDIR}/dnf/protected.d)