From 80dab03464519f17807ed80f7aaabc6af5d631e2 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Nov 03 2013 22:47:54 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index 25c1ba5..46ef0da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
 /cinnamon-session-1.9.2.tar.gz
 /cinnamon-session-2.0.0.tar.gz
 /cinnamon-session-2.0.1.tar.gz
+/cinnamon-session-2.0.4.tar.gz
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index b232bf4..85c5c76 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -3,15 +3,14 @@
 
 Summary: Cinnamon session manager
 Name:    cinnamon-session
-Version: 2.0.1
-Release: 2%{?dist}
+Version: 2.0.4
+Release: 1%{?dist}
 URL:     http://cinnamon.linuxmint.com
 # To generate tarball
 # wget https://github.com/linuxmint/cinnamon-session/tarball/%%{_internal_version} -O cinnamon-session-%%{version}.git%%{_internal_version}.tar.gz
 Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinnamon-session-%{version}.tar.gz
 
 Patch0:  remove_sessionmigration.patch
-Patch1:  fix-screeensaver-command.patch
 
 License: GPLv2+ and LGPLv2+
 Group:   User Interface/Desktops
@@ -63,7 +62,6 @@ the other core components and handles logout and saving the session.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -118,6 +116,10 @@ fi
 %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
 
 %changelog
+* Sun Nov 03 2013 Leigh Scott <leigh123linux@googlemail.com> - 2.0.4-1
+- update to 2.0.4
+- drop upstream patches
+
 * Wed Oct 30 2013 Leigh Scott <leigh123linux@googlemail.com> - 2.0.1-2
 - fix screeensaver command
 
diff --git a/fix-screeensaver-command.patch b/fix-screeensaver-command.patch
deleted file mode 100644
index e0f2c4f..0000000
--- a/fix-screeensaver-command.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cinnamon-session/csm-inhibit-dialog.c b/cinnamon-session/csm-inhibit-dialog.c
-index 2235f48..a650af5 100644
---- a/cinnamon-session/csm-inhibit-dialog.c
-+++ b/cinnamon-session/csm-inhibit-dialog.c
-@@ -97,7 +97,7 @@ lock_screen (CsmInhibitDialog *dialog)
- {
-         GError *error;
-         error = NULL;
--        g_spawn_command_line_async ("gnome-screensaver-command --lock", &error);
-+        g_spawn_command_line_async ("cinnamon-screensaver-command --lock", &error);
-         if (error != NULL) {
-                 g_warning ("Couldn't lock screen: %s", error->message);
-                 g_error_free (error);
diff --git a/sources b/sources
index 5fe5a72..d51ffdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dd48c4373999cabbaed2c0a578c44796  cinnamon-session-2.0.1.tar.gz
+19d15d682aa04a1911e574ee2ae54281  cinnamon-session-2.0.4.tar.gz