[cinnamon] Update to version 1.8.6

[leigh123linux]

commit 763a412938a99581d90aab8f9087f2ace5051175
Author: leigh scott <leigh at Leigh-PC.home>
Date:   Fri May 31 01:32:19 2013 +0100

    Update to version 1.8.6
    
    - patch to fix brightness applet (bz 967993)

 .gitignore     |    1 +
 cinnamon.spec  |   12 ++++++++++--
 idle-dim.patch |   35 +++++++++++++++++++++++++++++++++++
 sources        |    2 +-
 4 files changed, 47 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 66f1067..6aef071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /cinnamon-1.8.2.tar.gz
 /cinnamon-1.8.3.tar.gz
 /cinnamon-1.8.5.tar.gz
+/cinnamon-1.8.6.tar.gz
diff --git a/cinnamon.spec b/cinnamon.spec
index 94e7970..84efb39 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,6 +1,6 @@
 Name:           cinnamon
-Version:        1.8.5
-Release:        3%{?dist}
+Version:        1.8.6
+Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com
@@ -10,6 +10,8 @@ Source0:        http://leigh123linux.fedorapeople.org/pub/%{name}/source/%{name}
 
 Patch0:         gnome-3.8-compat.patch
 Patch1:         background.patch
+Patch2:         idle-dim.patch
+Patch3:         keyboard_applet.patch
 
 
 BuildRequires:  clutter-devel
@@ -90,6 +92,8 @@ The emphasis is put on making users feel at home and providing
 %setup -q -n Cinnamon-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -180,6 +184,10 @@ fi
 %{_datadir}/dbus-1/services/org.Cinnamon.HotplugSniffer.service
 
 %changelog
+* Thu May 30 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.6-1
+- Update to version 1.8.6
+- patch to fix brightness applet (bz 967993)
+
 * Wed May 22 2013 Leigh Scott <leigh123linux at googlemail.com> - 1.8.5-3
 - rebuild with release source and patch instead
 
diff --git a/idle-dim.patch b/idle-dim.patch
new file mode 100644
index 0000000..85f5123
--- /dev/null
+++ b/idle-dim.patch
@@ -0,0 +1,35 @@
+diff -Naur linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js
+--- linuxmint-Cinnamon-a464dc9.orig/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js	2013-04-30 18:01:56.000000000 +0200
++++ linuxmint-Cinnamon-a464dc9/files/usr/share/cinnamon/applets/brightness at cinnamon.org/applet.js	2013-05-02 19:32:12.934254811 +0200
+@@ -8,8 +8,7 @@
+ 
+ /* constants */
+ const DimSettingsSchema = "org.gnome.settings-daemon.plugins.power";
+-const DimSettingsAc = "idle-dim-ac";
+-const DimSettingsBattery = "idle-dim-battery";
++const DimSettings = "idle-dim";
+ const PowerBusName = 'org.gnome.SettingsDaemon';
+ const PowerObjectPath = '/org/gnome/SettingsDaemon/Power';
+ 
+@@ -116,10 +115,8 @@
+             
+             this._settingsMenu = new PopupMenu.PopupSubMenuMenuItem(_("Dimming settings"));
+             
+-            let dimSwitchAc = this._buildItem(_("Dim screen on AC power"), DimSettingsSchema, DimSettingsAc);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchAc);
+-            let dimSwitchBattery = this._buildItem(_("Dim screen on battery"), DimSettingsSchema, DimSettingsBattery);
+-            this._settingsMenu.menu.addMenuItem(dimSwitchBattery);
++            let dimSwitch = this._buildItem(_("Dim screen"), DimSettingsSchema, DimSettings);
++            this._settingsMenu.menu.addMenuItem(dimSwitch);
+                       
+             //initial update.
+             //We have to wait until dbus calls back to decide whether to display brightness controls.
+@@ -146,7 +146,7 @@
+                     this.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());
+                 }
+                 
+-                this.menu.addSettingsAction(_("Settings"), "screen");
++                this.menu.addSettingsAction(_("Settings"), "screensaver");
+ 		    }));
+         }
+         catch (e) {
diff --git a/sources b/sources
index d019653..6107ab2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-208ec6c1a1aae2cf6281dfb5d510604d  cinnamon-1.8.5.tar.gz
+b5e7996fefdfe2f33b4d4014526b7c8e  cinnamon-1.8.6.tar.gz