[cinnamon] update to 2.0.5

[leigh123linux]

commit 3396881644fa8791838deed41c91b223f3de53dc
Author: leigh123linux <leigh123linux at googlemail.com>
Date:   Thu Oct 24 14:04:18 2013 +0100

    update to 2.0.5

 .gitignore                   |    1 +
 cinnamon-settings-apps.patch |    6 +-
 cinnamon.spec                |    9 +-
 git_rollup_fixes.patch       |  267 ------------------------------------------
 sources                      |    2 +-
 5 files changed, 11 insertions(+), 274 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 16cef97..d9e4945 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@
 /cinnamon-1.9.2.tar.gz
 /Cinnamon-2.0.2.tar.gz
 /Cinnamon-2.0.3.tar.gz
+/Cinnamon-2.0.5.tar.gz
diff --git a/cinnamon-settings-apps.patch b/cinnamon-settings-apps.patch
index d7ed35b..1a5b154 100644
--- a/cinnamon-settings-apps.patch
+++ b/cinnamon-settings-apps.patch
@@ -1,11 +1,11 @@
 --- a/files/usr/lib/cinnamon-settings/cinnamon-settings.py
 +++ b/files/usr/lib/cinnamon-settings/cinnamon-settings.py
-@@ -65,7 +65,7 @@ CONTROL_CENTER_MODULES = [
+@@ -66,7 +66,7 @@ CONTROL_CENTER_MODULES = [
  STANDALONE_MODULES = [
  #         Label                          Executable                          Icon                Category        Advanced?               Keywords for filter
      [_("Printers"),                      "system-config-printer",        "printer.svg",         "hardware",       False,          _("printers, laser, inkjet")],    
--    [_("Firewall"),                      "gufw",                         "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
-+    [_("Firewall"),                      "firewall-config",              "firewall.svg",        "prefs",          True,           _("firewall, block, filter, programs")],
+-    [_("Firewall"),                      "gufw",                         "firewall.svg",        "admin",          True,           _("firewall, block, filter, programs")],
++    [_("Firewall"),                      "firewall-config",              "firewall.svg",        "admin",          True,           _("firewall, block, filter, programs")],
      [_("Languages"),                     "gnome-language-selector",      "language.svg",        "prefs",          False,          _("language, install, foreign")],
      [_("Login Screen"),                  "gksu /usr/sbin/mdmsetup",      "login.svg",           "admin",          True,           _("login, mdm, gdm, manager, user, password, startup, switch")],
      [_("Startup Programs"),              "cinnamon-session-properties",  "startup-programs.svg","prefs",          False,          _("startup, programs, boot, init, session")],
diff --git a/cinnamon.spec b/cinnamon.spec
index 1b02c50..05e0ce4 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -1,7 +1,7 @@
 #global _internal_version  8a53cfb
 
 Name:           cinnamon
-Version:        2.0.3
+Version:        2.0.5
 Release:        1%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
@@ -103,10 +103,10 @@ Requires:       python-pexpect
 %endif
 Requires:       opencv-python
 Requires:       cinnamon-control-center
-Requires:       cinnamon-screensaver
 Requires:       cinnamon-translations
-# nemo is a RequiredComponents in the session files
+# RequiredComponents in the session files
 Requires:       nemo
+Requires:       cinnamon-screensaver
 
 # metacity is needed for fallback
 Requires:       metacity
@@ -224,6 +224,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Thu Oct 24 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.5-1
+- update to 2.0.5
+
 * Fri Oct 18 2013 Leigh Scott <leigh123linux at googlemail.com> - 2.0.3-1
 - update to 2.0.3
 
diff --git a/sources b/sources
index 7646335..7f27f29 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2c587a9f905d060394daf92f4dff240c  Cinnamon-2.0.3.tar.gz
+08a614a07b0d8dc47b79980cdf705b3c  Cinnamon-2.0.5.tar.gz