diff --git a/cinnamon-settings-daemon.spec b/cinnamon-settings-daemon.spec index 3ad66be..70d9233 100644 --- a/cinnamon-settings-daemon.spec +++ b/cinnamon-settings-daemon.spec @@ -1,8 +1,8 @@ -%global _internal_version d5d8dfa +%global _internal_version 6c1f75c Name: cinnamon-settings-daemon Version: 1.0.0 -Release: 0.5.git%{_internal_version}%{?dist} +Release: 0.6.git%{_internal_version}%{?dist} Summary: The daemon sharing settings from CINNAMON to GTK+/KDE applications Group: System Environment/Daemons @@ -13,9 +13,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 Patch0: %{name}_gnome_3.9.patch -# https://git.gnome.org/browse/gnome-settings-daemon/commit/plugins/common/gsd-input-helper.c?id=14f92b1479aa065edf3f0aa86b87d4c4ff1fe2ba -Patch1: media_keys_fix.patch - Requires: cinnamon-control-center-filesystem Requires: hicolor-icon-theme @@ -78,7 +75,6 @@ This package contains the updates plugin for %{name} %prep %setup -q -n linuxmint-cinnamon-settings-daemon-%{_internal_version} %patch0 -p1 -%patch1 -p1 NOCONFIGURE=1 ./autogen.sh %build @@ -253,6 +249,10 @@ fi %{_datadir}/dbus-1/interfaces/org.cinnamon.SettingsDaemonUpdates.xml %changelog +* Wed Jul 31 2013 Leigh Scott - 1.0.0-0.6.git6c1f75c +- update to latest git +- drop media key patch + * Wed Jul 24 2013 Leigh Scott - 1.0.0-0.5.gitd5d8dfa - change require gnome control-center to cinnamon diff --git a/media_keys_fix.patch b/media_keys_fix.patch deleted file mode 100644 index 7a77c86..0000000 --- a/media_keys_fix.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/plugins/common/csd-input-helper.c -+++ b/plugins/common/csd-input-helper.c -@@ -127,18 +127,11 @@ supports_xinput2_devices (int *opcode) - gdk_error_trap_push (); - - major = 2; -- minor = 0; -+ minor = 3; - - if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { - gdk_error_trap_pop_ignored (); -- /* try for 2.2, maybe gtk has already announced 2.2 support */ -- gdk_error_trap_push (); -- major = 2; -- minor = 2; -- if (XIQueryVersion (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), &major, &minor) != Success) { -- gdk_error_trap_pop_ignored (); - return FALSE; -- } - } - gdk_error_trap_pop_ignored (); -