leigh123linux pushed to cinnamon-desktop (f22). "Merge branch 'master' into f22"

[notifications at fedoraproject.org]

From 3ab8afee4c370eceaa200ff36852a50c4165fbe0 Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Thu, 21 May 2015 11:08:56 +0100
Subject: add upstream patch to fix USERNAME issue


diff --git a/0001-gnome-desktop-thumbnail-always-return-a-user.patch b/0001-gnome-desktop-thumbnail-always-return-a-user.patch
new file mode 100644
index 0000000..63ea58a
--- /dev/null
+++ b/0001-gnome-desktop-thumbnail-always-return-a-user.patch
@@ -0,0 +1,31 @@
+From fce4621ee164bd872cdb5c4c7afb7534113db9f5 Mon Sep 17 00:00:00 2001
+From: mtwebster <miketwebster at gmail.com>
+Date: Thu, 21 May 2015 05:59:09 -0400
+Subject: [PATCH] gnome-desktop-thumbnail: always return a user.
+
+---
+ libcinnamon-desktop/gnome-desktop-thumbnail.c | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/libcinnamon-desktop/gnome-desktop-thumbnail.c b/libcinnamon-desktop/gnome-desktop-thumbnail.c
+index 46b8a71..0b4298d 100644
+--- a/libcinnamon-desktop/gnome-desktop-thumbnail.c
++++ b/libcinnamon-desktop/gnome-desktop-thumbnail.c
+@@ -1891,11 +1891,12 @@ get_session_user_pwent (void)
+         pwent = getpwuid (uid);
+     } else if (g_getenv ("USERNAME") != NULL) {
+         pwent = getpwnam (g_getenv ("USERNAME"));
++    } else if (g_getenv ("USER") != NULL) {
++        pwent = getpwnam (g_getenv ("USER"));
+     }
+ 
+     if (!pwent) {
+-        g_printerr ("thumbnailer: Could not determine session user.\n");
+-        return NULL;
++        return getpwuid (getuid ());
+     }
+ 
+     return pwent;
+-- 
+2.4.1
+
diff --git a/cinnamon-desktop.spec b/cinnamon-desktop.spec
index 39e4a29..985cee2 100644
--- a/cinnamon-desktop.spec
+++ b/cinnamon-desktop.spec
@@ -7,7 +7,7 @@
 Summary: Shared code among cinnamon-session, nemo, etc
 Name:    cinnamon-desktop
 Version: 2.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+ and LGPLv2+ add MIT
 URL:     http://cinnamon.linuxmint.com
 # To generate tarball
@@ -18,6 +18,7 @@ Source1: cinnamon-mimeapps.list
 
 Patch0:   set_font_defaults.patch
 Patch1:   set_logind.patch
+Patch2:   0001-gnome-desktop-thumbnail-always-return-a-user.patch
 
 Requires: redhat-menus
 
@@ -62,6 +63,7 @@ libcinnamondesktop.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 NOCONFIGURE=1 ./autogen.sh
 
 %build
@@ -113,6 +115,9 @@ fi
 %{_datadir}/gir-1.0/C*-3.0.gir
 
 %changelog
+* Thu May 21 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.1-2
+- add upstream patch to fix USERNAME issue
+
 * Thu May 21 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.6.1-1
 - update to 2.6.1 release
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon-desktop.git/commit/?h=f22&id=e7c3e44cc171833f49a8a8879fdb2ae62aeb1b37