From ca323817dbc54775841573a622605808d7fb4864 Mon Sep 17 00:00:00 2001 From: chenhaixing Date: Mon, 6 Jun 2022 15:21:53 +0800 Subject: [PATCH] fix conflict while upgrade dnf main package --- dnf.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dnf.spec b/dnf.spec index 67f5e57..b1d1eaa 100644 --- a/dnf.spec +++ b/dnf.spec @@ -3,7 +3,7 @@ Name: dnf Version: 4.10.0 -Release: 5 +Release: 6 Summary: A software package manager that manages packages on Linux distributions. License: GPLv2+ and GPLv2 and GPL URL: https://github.com/rpm-software-management/dnf @@ -155,7 +155,6 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %files %{_bindir}/%{name} %{_sysconfdir}/bash_completion.d/%{name} -%{_datadir}/bash-completion/* %{_unitdir}/%{name}-makecache.timer %{_unitdir}/%{name}-makecache.service %{_var}/cache/%{name}/ @@ -216,6 +215,7 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %files help %{_datadir}/locale/* +%{_datadir}/bash-completion/* %{_mandir}/man8/yum.8* %{_mandir}/man8/yum2dnf.8* %{_mandir}/man8/%{name}.8* @@ -228,6 +228,12 @@ ln -sr %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v %{_mandir}/man8/%{name}-automatic.8* %changelog +* Mon Jun 06 2022 chenhaixing - 4.10.0-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix conflict while upgrade dnf main package + * Thu May 05 2022 chenhaixing - 4.10.0-5 - Type:bugfix - CVE:NA