From 44d009882c6992e0252665a4fd91d9e27513c418 Mon Sep 17 00:00:00 2001
From: chenhaixing <chenhaixing@huawei.com>
Date: Tue, 28 Jun 2022 10:52:39 +0800
Subject: [PATCH] fix dnf-data downgrade conflict with dnf

---
 dnf.spec | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/dnf.spec b/dnf.spec
index b1d1eaa..40ecb8e 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -3,7 +3,7 @@
 
 Name:                 dnf
 Version:              4.10.0
-Release:              6
+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
@@ -228,6 +228,12 @@ 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