From 6b0eeb980fe71fcb8ceb91b6eef0b6ce5ad7a2cf Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 31 Jul 2017 15:57:37 +0100 Subject: [PATCH] Add explicit conflicts to not break older gnome-session and gnome-shell --- gnome-settings-daemon.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/gnome-settings-daemon.spec b/gnome-settings-daemon.spec index 9009a27..c767354 100644 --- a/gnome-settings-daemon.spec +++ b/gnome-settings-daemon.spec @@ -8,7 +8,7 @@ Name: gnome-settings-daemon Version: 3.25.4 -Release: 1%{?dist} +Release: 2%{?dist} Summary: The daemon sharing settings from GNOME to GTK+/KDE applications License: GPLv2+ @@ -68,7 +68,8 @@ Obsoletes: gnome-settings-daemon-devel < 3.23.1 # The orientation and xrandr plugins were removed in 3.25.4 and their # functionality was moved to mutter; this conflict here makes sure not to break -# older gnome-shell versions that expect the functionality +# older gnome-session and gnome-shell releases that expect the functionality +Conflicts: gnome-session < 3.25.4 Conflicts: gnome-shell < 3.25.4 %description @@ -212,6 +213,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_libexecdir}/gsd-test-input-helper %changelog +* Mon Jul 31 2017 Kalev Lember - 3.25.4-2 +- Add explicit conflicts to not break older gnome-session and gnome-shell + * Mon Jul 31 2017 Kalev Lember - 3.25.4-1 - Update to 3.25.4