!119 fix conflict while upgrade dnf main package

From: @chen-haixing-hw 
Reviewed-by: @anonymous_z 
Signed-off-by: @anonymous_z

dnf.spec

@@ -3,7 +3,7 @@
 
 Name:                 dnf
 Version:              4.10.0
-Release:              5
+Release:              7
 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
@@ -63,7 +63,7 @@ Python 3 interface to DNF.
 %package data
 Summary:        Common data and configuration files for DNF
 Requires:       libreport-filesystem
-Obsoletes:      %{name}-conf <= %{version}-%{release}
+Obsoletes:      %{name}-conf <= %{version}-%{release} %{name} < %{version}-%{release}
 Provides:       %{name}-conf = %{version}-%{release}
  
 %description data
@@ -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,18 @@ ln -sr  %{buildroot}%{_sysconfdir}/%{name}/vars %{buildroot}%{_sysconfdir}/yum/v
 %{_mandir}/man8/%{name}-automatic.8*
 
 %changelog
+* Thu Jun 28 2022 chenhaixing <chenhaixing@huawei.com> - 4.10.0-7
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix dnf-data downgrade confilct with dnf
+
+* Mon Jun 06 2022 chenhaixing <chenhaixing@huawei.com> - 4.10.0-6
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC:fix conflict while upgrade dnf main package
+
 * Thu May 05 2022 chenhaixing <chenhaixing@huawei.com> - 4.10.0-5
 - Type:bugfix
 - CVE:NA