From 9b3b9349c7bdaf867f8c339003fff174ec1538af Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Tue, 23 Mar 2021 13:45:26 +0000
Subject: [PATCH] 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/gnome-settings-daemon.git#34682f1b9b934d8f90d21d99ad806bdf5baa542d
---
 gnome-settings-daemon.spec | 18 +++++++-----------
 sources                    |  2 +-
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec
index 476d4a8..157a611 100644
--- a/gnome-settings-daemon.spec
+++ b/gnome-settings-daemon.spec
@@ -1,8 +1,8 @@
 %global glib2_version 2.56
-%global colord_version 1.3.5
+%global colord_version 1.4.5
 %global geocode_glib_version 3.10.0
 %global gnome_desktop_version 3.37.1
-%global gsettings_desktop_schemas_version 40~alpha
+%global gsettings_desktop_schemas_version 40
 %global gtk3_version 3.15.3
 %global libgweather_version 40~alpha
 %global geoclue_version 2.3.1
@@ -10,7 +10,7 @@
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           gnome-settings-daemon
-Version:        40~rc
+Version:        40.0
 Release:        1%{?dist}
 Summary:        The daemon sharing settings from GNOME to GTK+/KDE applications
 
@@ -66,14 +66,6 @@ Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_versi
 Requires: gtk3%{?_isa} >= %{gtk3_version}
 Requires: libgweather%{?_isa} >= %{libgweather_version}
 
-Obsoletes: %{name}-updates < 3.13.1
-Obsoletes: drwright < 3.5.0-3
-Obsoletes: gnome-settings-daemon-devel < 3.23.1
-
-# Earlier gnome-session required "org.gnome.SettingsDaemon.Clipboard" that was
-# dropped in 3.33.90 (and functionality moved over to mutter).
-Conflicts: gnome-session < 3.33.90
-
 %description
 A daemon to share settings from GNOME to other applications. It also
 handles global keybindings, as well as a number of desktop-wide settings.
@@ -192,6 +184,10 @@ cp %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/glib-2.0/schemas
 %{_libdir}/pkgconfig/gnome-settings-daemon.pc
 
 %changelog
+* Mon Mar 22 2021 Kalev Lember <klember@redhat.com> - 40.0-1
+- Update to 40.0
+- Drop old obsoletes/conflicts
+
 * Mon Mar 15 2021 Kalev Lember <klember@redhat.com> - 40~rc-1
 - Update to 40.rc
 
diff --git a/sources b/sources
index 4f629c2..9ec59a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gnome-settings-daemon-40.rc.tar.xz) = 0fa31fe1372a3e2c680ff7958351a9cd17e0172e812dccb3119e4a7cc8e58ff6ab9e808b64bc0fe7d1f41045bf765b3eb34a08c4f117424bf7631a03bcda6885
+SHA512 (gnome-settings-daemon-40.0.tar.xz) = 59429f8bc01bd84bb50bc297f80ad65e48fef3f0c965ae41571a528b7829e5a3a197e2ded06e1286629a411e5683dfd154267ee99c0dcabbf2d21f389e1f276e