Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/dconf-editor.git#d94ebe63853fcb4a78acbd86ba5d1c5eeccc9b82

.gitignore

@@ -48,3 +48,4 @@
 /dconf-editor-3.37.91.tar.xz
 /dconf-editor-3.38.0.tar.xz
 /dconf-editor-3.38.2.tar.xz
+/dconf-editor-3.38.3.tar.xz

dconf-editor.spec

@@ -3,8 +3,8 @@
 %global gtk3_version 3.22.27
 
 Name:           dconf-editor
-Version:        3.38.2
-Release:        2%{?dist}
+Version:        3.38.3
+Release:        1%{?dist}
 Summary:        Configuration editor for dconf
 
 License:        GPLv3+ and CC0
@@ -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.
 
@@ -70,6 +67,10 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/ca.desrt.dconf-edi
 %{_mandir}/man1/dconf-editor.1*
 
 %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
 

sources

@@ -1 +1 @@
-SHA512 (dconf-editor-3.38.2.tar.xz) = 64bcf7c5cea2c70f2c4ee08832490495c8c2dfee805d6fc27583e1369444f81ef9818f83de7c71228c88322f32c258c4550cc908263f1bb3032ab67e514efb2b
+SHA512 (dconf-editor-3.38.3.tar.xz) = cf00705c1e11eab980777b9696fbaaa0f5f8a8118276f2add4f4fcefe5aab46844a539539418ce61f285e65623179a9d63cc18a91339b70b5e7c9408c697e9d1