From dfabdf6ff7178fd56221d58c6ae686492c618137 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: May 12 2020 14:42:45 +0000 Subject: Update to 4.6.0 release --- diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index 10c040e..754a41e 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -1,14 +1,13 @@ -%global cinnamon_desktop_version 4.4.0 +%global cinnamon_desktop_version 4.6.0 Name: cinnamon-settings-daemon -Version: 4.4.0 -Release: 3%{?dist} +Version: 4.6.0 +Release: 1%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications License: GPLv2+ and LGPLv2+ URL: https://github.com/linuxmint/%{name} Source0: %url/archive/%{version}/%{name}-%{version}.tar.gz -Patch0: %url/commit/4c19a41429524a2da202b919a335a646103da0fd.patch#/restore_old_logind_check.patch # add hard cinnamon-desktop required version due logind schema Requires: cinnamon-desktop%{?_isa} >= %{cinnamon_desktop_version} @@ -137,6 +136,9 @@ chmod a+x %buildroot%{_datadir}/cinnamon-settings-daemon-3.0/input-device-exampl %changelog +* Tue May 12 2020 Leigh Scott - 4.6.0-1 +- Update to 4.6.0 release + * Tue Jan 28 2020 Fedora Release Engineering - 4.4.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/restore_old_logind_check.patch b/restore_old_logind_check.patch deleted file mode 100644 index 90b6373..0000000 --- a/restore_old_logind_check.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4c19a41429524a2da202b919a335a646103da0fd Mon Sep 17 00:00:00 2001 -From: Leigh Scott -Date: Wed, 11 Dec 2019 23:29:08 +0000 -Subject: [PATCH] Restore old check for logind - ---- - cinnamon-settings-daemon/cinnamon-settings-session.c | 2 +- - plugins/common/csd-power-helper.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/cinnamon-settings-daemon/cinnamon-settings-session.c b/cinnamon-settings-daemon/cinnamon-settings-session.c -index adbe1e7..4d52b21 100644 ---- a/cinnamon-settings-daemon/cinnamon-settings-session.c -+++ b/cinnamon-settings-daemon/cinnamon-settings-session.c -@@ -378,7 +378,7 @@ cinnamon_settings_session_init (CinnamonSettingsSession *session) - session->priv = CINNAMON_SETTINGS_SESSION_GET_PRIVATE (session); - - #ifdef HAVE_LOGIND -- if (access("/run/systemd/system/", F_OK) == 0) { // sd_booted () -+ if (access("/run/systemd/seats/", F_OK) == 0) { // sd_booted () - sd_pid_get_session (getpid(), &session->priv->session_id); - session->priv->sd_source = sd_source_new (); - g_source_set_callback (session->priv->sd_source, sessions_changed, session, NULL); -diff --git a/plugins/common/csd-power-helper.c b/plugins/common/csd-power-helper.c -index 5a83072..82c0b22 100644 ---- a/plugins/common/csd-power-helper.c -+++ b/plugins/common/csd-power-helper.c -@@ -41,7 +41,7 @@ use_logind (void) - static gsize once_init_value = 0; - - if (g_once_init_enter (&once_init_value)) { -- should_use_logind = access("/run/systemd/system/", F_OK) == 0; // sd_booted () -+ should_use_logind = access("/run/systemd/seats/", F_OK) == 0; // sd_booted () - - g_once_init_leave (&once_init_value, 1); - } diff --git a/sources b/sources index 928edeb..e769360 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (cinnamon-settings-daemon-4.4.0.tar.gz) = dc4b0c570b345577bd20e85b44f4c99c3e3c88a2c2aea7c928e1fae931dc4dc07c6dd64c5917661434d35e3ae606c8189c3f77e0658925b5cc6ba2dc1885cb81 +SHA512 (cinnamon-settings-daemon-4.6.0.tar.gz) = b9c8aaa36331da967a55a73711d0c18e5331525d27bae82ecf87da03f98db43ca99e78f249cd4af8e5bcd72b956ee9d95ad8a4453852c3aba8b921b7f9444b9d