From d94ebe63853fcb4a78acbd86ba5d1c5eeccc9b82 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 23 Mar 2021 17:26:38 +0100
Subject: [PATCH] Remove old conflicts with dconf package

---
 dconf-editor.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/dconf-editor.spec b/dconf-editor.spec
index e97d6c9..64dff3e 100644
--- a/dconf-editor.spec
+++ b/dconf-editor.spec
@@ -27,9 +27,6 @@ Requires:       dconf%{?_isa} >= %{dconf_version}
 Requires:       glib2%{?_isa} >= %{glib2_version}
 Requires:       gtk3%{?_isa} >= %{gtk3_version}
 
-# dconf-editor has been split off dconf in 0.23.1
-Conflicts: dconf <= 0.23.1
-
 %description
 Graphical tool for editing the dconf configuration database.
 
@@ -72,6 +69,7 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ca.desrt.dconf-edi
 %changelog
 * Tue Mar 23 2021 Kalev Lember <klember@redhat.com> - 3.38.3-1
 - Update to 3.38.3
+- Remove old conflicts with dconf package
 
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.38.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild