leigh123linux pushed to cinnamon-settings-daemon (f21). "update to 2.6.1 release"

[notifications at fedoraproject.org]

From 51578445273bfee65cbf87f3a2f25524ecde98b6 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Mon, 25 May 2015 13:49:04 +0100
Subject: update to 2.6.1 release


diff --git a/.gitignore b/.gitignore
index 99b791b..cd7e170 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,3 +28,4 @@
 /cinnamon-settings-daemon-2.5.0.git8430be2.tar.gz
 /cinnamon-settings-daemon-2.5.0.gitd228d00.tar.gz
 /cinnamon-settings-daemon-2.6.0.tar.gz
+/cinnamon-settings-daemon-2.6.1.tar.gz
diff --git a/0001-Fix-broken-KB-shortcuts-for-suspend-hibernate-and-sh.patch b/0001-Fix-broken-KB-shortcuts-for-suspend-hibernate-and-sh.patch
deleted file mode 100644
index 0cbe036..0000000
--- a/0001-Fix-broken-KB-shortcuts-for-suspend-hibernate-and-sh.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f77d0ffb4ea88139faecb530ae1402de7533702c Mon Sep 17 00:00:00 2001
-From: leigh123linux <leigh123linux at fedoraproject.org>
-Date: Sun, 24 May 2015 02:14:55 +0100
-Subject: [PATCH] Fix broken KB shortcuts for suspend, hibernate and shutdown
-
----
- plugins/media-keys/csd-media-keys-manager.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/media-keys/csd-media-keys-manager.c b/plugins/media-keys/csd-media-keys-manager.c
-index 0f8c8f5..4a48733 100644
---- a/plugins/media-keys/csd-media-keys-manager.c
-+++ b/plugins/media-keys/csd-media-keys-manager.c
-@@ -1733,7 +1733,7 @@ start_media_keys_idle_cb (CsdMediaKeysManager *manager)
-         manager->priv->use_logind = g_settings_get_boolean (manager->priv->session_settings, "use-systemd");
- 
-         /* for the power plugin interface code */
--        manager->priv->power_settings = g_settings_new ("org.cinnamon.desktop.session");
-+        manager->priv->power_settings = g_settings_new (SETTINGS_POWER_DIR);
- 
-         /* Logic from http://git.gnome.org/browse/gnome-shell/tree/js/ui/status/accessibility.js#n163 */
-         manager->priv->interface_settings = g_settings_new (SETTINGS_INTERFACE_DIR);
--- 
-2.4.1
-
diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec
index b855e9c..94dd24e 100644
--- a/cinnamon-settings-daemon.spec
+++ b/cinnamon-settings-daemon.spec
@@ -1,8 +1,9 @@
 #global _internal_version  d228d00
+%global cinnamon_desktop_version 2.6.3
 
 Name:           cinnamon-settings-daemon
-Version:        2.6.0
-Release:        2%{?dist}
+Version:        2.6.1
+Release:        1%{?dist}
 Summary:        The daemon sharing settings from CINNAMON to GTK+/KDE applications
 
 Group:          System Environment/Daemons
@@ -12,13 +13,14 @@ URL:            http://cinnamon.linuxmint.com
 # wget https://github.com/linuxmint/cinnamon-settings-daemon/tarball/%%{_internal_version} -O cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz
 #Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%%{version}.git%%{_internal_version}.tar.gz
 Source0:        http://leigh123linux.fedorapeople.org/pub/cinnamon-settings-daemon/source/cinnamon-settings-daemon-%{version}.tar.gz
-Patch0:         0001-Fix-broken-KB-shortcuts-for-suspend-hibernate-and-sh.patch
 
+# add hard cinnamon-desktop required version due logind schema
+Requires:       cinnamon-desktop >= %{cinnamon_desktop_version}
 Requires:       cinnamon-control-center-filesystem
 Obsoletes:      cinnamon-settings-daemon-updates
 
 BuildRequires:  pkgconfig(dbus-glib-1)
-BuildRequires:  pkgconfig(cinnamon-desktop) >= 2.6.0
+BuildRequires:  pkgconfig(cinnamon-desktop) >= %{cinnamon_desktop_version}
 BuildRequires:  pkgconfig(xxf86misc)
 BuildRequires:  pkgconfig(gstreamer-plugins-base-0.10)
 BuildRequires:  pkgconfig(libpulse)
@@ -132,6 +134,9 @@ fi
 
 
 %changelog
+* Mon May 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.1-1
+- update to 2.6.1 release
+
 * Sun May 24 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.0-2
 - add patch to fix keyboard shortcuts for power actions (bz 1224523)
 
diff --git a/sources b/sources
index 07815c1..a5f34ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-87b4e796a44a74935a82c4c48ce37526  cinnamon-settings-daemon-2.6.0.tar.gz
+b4ce87b6fd261c07c6ad418c575f44af  cinnamon-settings-daemon-2.6.1.tar.gz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon-settings-daemon.git/commit/?h=f21&id=51578445273bfee65cbf87f3a2f25524ecde98b6