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 95d93775ea..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 @@ -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