diff --git a/.gitignore b/.gitignore index 4bd25a4..b8358ea 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /cinnamon-settings-daemon-2.6.0.tar.gz /cinnamon-settings-daemon-2.6.1.tar.gz /cinnamon-settings-daemon-2.6.3.tar.gz +/cinnamon-settings-daemon-2.8.0.tar.gz diff --git a/0001-Stop-using-deprecated-GSettings-schema-property.patch b/0001-Stop-using-deprecated-GSettings-schema-property.patch deleted file mode 100644 index 9dea6e8..0000000 --- a/0001-Stop-using-deprecated-GSettings-schema-property.patch +++ /dev/null @@ -1,42 +0,0 @@ -From bc23908c942564368b9babc13986c81f2a7fa431 Mon Sep 17 00:00:00 2001 -From: leigh123linux -Date: Sun, 30 Aug 2015 09:11:48 +0100 -Subject: [PATCH] Stop using deprecated GSettings:schema property - ---- - plugins/wacom/list-wacom.c | 4 ++-- - plugins/xsettings/csd-xsettings-manager.c | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/plugins/wacom/list-wacom.c b/plugins/wacom/list-wacom.c -index 4e917e1..6d355a5 100644 ---- a/plugins/wacom/list-wacom.c -+++ b/plugins/wacom/list-wacom.c -@@ -38,9 +38,9 @@ get_loc (GSettings *settings) - - g_object_get (G_OBJECT (settings), - "path", &path, -- "schema", &schema, -+ "schema-id", &schema, - NULL); -- ret = g_strdup_printf ("schema: %s (path: %s)", schema, path); -+ ret = g_strdup_printf ("schema-id: %s (path: %s)", schema, path); - g_free (schema); - g_free (path); - -diff --git a/plugins/xsettings/csd-xsettings-manager.c b/plugins/xsettings/csd-xsettings-manager.c -index 18fa332..76cae81 100644 ---- a/plugins/xsettings/csd-xsettings-manager.c -+++ b/plugins/xsettings/csd-xsettings-manager.c -@@ -797,7 +797,7 @@ find_translation_entry (GSettings *settings, const char *key) - guint i; - char *schema; - -- g_object_get (settings, "schema", &schema, NULL); -+ g_object_get (settings, "schema-id", &schema, NULL); - - for (i = 0; i < G_N_ELEMENTS (translations); i++) { - if (g_str_equal (schema, translations[i].gsettings_schema) && --- -2.4.3 - diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index a6a1fc1..df86d5c 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -1,9 +1,9 @@ #global _internal_version d228d00 -%global cinnamon_desktop_version 2.6.3 +%global cinnamon_desktop_version 2.8.0 Name: cinnamon-settings-daemon -Version: 2.6.3 -Release: 5%{?dist} +Version: 2.8.0 +Release: 1%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications Group: System Environment/Daemons @@ -14,7 +14,6 @@ URL: http://cinnamon.linuxmint.com #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: glib2_settings.patch -Patch1: 0001-Stop-using-deprecated-GSettings-schema-property.patch # add hard cinnamon-desktop required version due logind schema Requires: cinnamon-desktop >= %{cinnamon_desktop_version} @@ -137,6 +136,9 @@ fi %changelog +* Fri Oct 16 2015 Leigh Scott - 2.8.0-1 +- update to 2.8.0 release + * Wed Sep 09 2015 Leigh Scott - 2.6.3-5 - Stop using deprecated GSettings schema property diff --git a/sources b/sources index 426b71f..643d7bf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -921ffcc4ce24d7146b34c074045d3b81 cinnamon-settings-daemon-2.6.3.tar.gz +67658d6d0d908913c5f7f2218ff79815 cinnamon-settings-daemon-2.8.0.tar.gz