From b219d462a3e79bb6ea2ded7b517471dcb8a831fb Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux@googlemail.com>
Date: Apr 02 2014 07:34:27 +0000
Subject: Merge branch 'master' into f19


---

diff --git a/.gitignore b/.gitignore
index 69afdf3..223436f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@
 /cinnamon-session-2.0.1.tar.gz
 /cinnamon-session-2.0.4.tar.gz
 /cinnamon-session-2.0.5.tar.gz
+/cinnamon-session-2.0.6.tar.gz
diff --git a/cinnamon-session.spec b/cinnamon-session.spec
index c5eb5fa..d5f4ab8 100644
--- a/cinnamon-session.spec
+++ b/cinnamon-session.spec
@@ -3,8 +3,8 @@
 
 Summary: Cinnamon session manager
 Name:    cinnamon-session
-Version: 2.0.5
-Release: 2%{?dist}
+Version: 2.0.6
+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
@@ -12,6 +12,7 @@ Source0: http://leigh123linux.fedorapeople.org/pub/cinnamon-session/source/cinna
 
 Patch0:  remove_sessionmigration.patch
 Patch1:  cinnamon-session-upower.patch
+Patch2:  revert_clutter_xinput.patch
 
 License: GPLv2+ and LGPLv2+
 Group:   User Interface/Desktops
@@ -42,9 +43,7 @@ BuildRequires: pkgconfig(json-glib-1.0)
 
 # this is so the configure checks find /usr/bin/halt etc.
 BuildRequires: usermode
-%if 0%{?fedora}
 BuildRequires: pkgconfig(pangox)
-%endif
 BuildRequires: pkgconfig(xt)
 BuildRequires: pkgconfig(xtst)
 BuildRequires: pkgconfig(upower-glib)
@@ -65,6 +64,7 @@ the other core components and handles logout and saving the session.
 %setup -q
 %patch0 -p1
 %patch1 -p1 -b .upower_deprecated
+%patch2 -p1
 rm missing
 NOCONFIGURE=1 ./autogen.sh
 
@@ -120,6 +120,11 @@ fi
 %{_datadir}/glib-2.0/schemas/org.cinnamon.SessionManager.gschema.xml
 
 %changelog
+* Wed Apr 02 2014 Leigh Scott <leigh123linux@googlemail.com> - 2.0.6-1
+- update to 2.0.6
+- readd Br pangox-compat-devel for epel
+- add upstream fix for clutter xinput (bz 873434)
+
 * Mon Jan 13 2014 Leigh Scott <leigh123linux@googlemail.com> - 2.0.5-2
 - make changes for epel7
 
diff --git a/revert_clutter_xinput.patch b/revert_clutter_xinput.patch
new file mode 100644
index 0000000..a924470
--- /dev/null
+++ b/revert_clutter_xinput.patch
@@ -0,0 +1,10 @@
+--- a/cinnamon-session/main.c
++++ b/cinnamon-session/main.c
+@@ -347,7 +347,6 @@ main (int argc, char **argv)
+          * detect if GNOME is running. We keep this for compatibility reasons.
+          */
+         csm_util_setenv ("GNOME_DESKTOP_SESSION_ID", "this-is-deprecated");
+-        csm_util_setenv ("CLUTTER_DISABLE_XINPUT", "1");
+ 
+         client_store = csm_store_new ();
+ 
diff --git a/sources b/sources
index 3d7ed6a..7487d6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-29191cc7b90b667b698c370df20fce28  cinnamon-session-2.0.5.tar.gz
+caa16ec2cd89cc5466e4131ab096a3bd  cinnamon-session-2.0.6.tar.gz