Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[spec] Remove /etc/dnf/protected.d/dnf.conf #1991

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion VERSION.cmake
Original file line number Diff line number Diff line change
@@ -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})
Expand Down
5 changes: 2 additions & 3 deletions dnf.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion etc/dnf/protected.d/CMakeLists.txt
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)
1 change: 0 additions & 1 deletion etc/dnf/protected.d/dnf.conf

This file was deleted.