[gdm/f16] re-add check for gnome-shell before using it to handle login

[Adam Williamson]

commit 6e1f10b28a12cf453f91b758537e9ae925276815
Author: Adam Williamson <awilliam at redhat.com>
Date:   Wed Oct 5 15:59:54 2011 -0700

    re-add check for gnome-shell before using it to handle login

 gdm-3.2.0-shell_check.patch |   29 +++++++++++++++++++++++++++++
 gdm.spec                    |   11 ++++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/gdm-3.2.0-shell_check.patch b/gdm-3.2.0-shell_check.patch
new file mode 100644
index 0000000..b366f4a
--- /dev/null
+++ b/gdm-3.2.0-shell_check.patch
@@ -0,0 +1,29 @@
+From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
+From: György Balló <ballogy at freestart.hu>
+Date: Fri, 30 Sep 2011 21:48:40 +0000
+Subject: data: add back check for gnome-shell before running gdm-shell session
+
+Add back commit 4892c9447324f2248ce944f150abe3143f78eaa3
+
+This commit does a quick check to make sure gnome-shell is
+installed, and supports --gdm-mode. If either of those fail,
+then fall back to the old greeter.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=660409
+---
+(limited to 'data/gdm-shell.session.in')
+
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+index 3d408c3..496cc10 100644
+--- a/data/gdm-shell.session.in
++++ b/data/gdm-shell.session.in
+@@ -1,5 +1,5 @@
+ [GNOME Session]
+ Name=Display Manager
+ RequiredComponents=gnome-shell;gnome-settings-daemon;
+-IsRunnableHelper=@libexecdir@/gnome-session-check-accelerated
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+--
+cgit v0.9.0.2
+
diff --git a/gdm.spec b/gdm.spec
index 80e81c9..711ba8f 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 3.2.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -99,6 +99,10 @@ Requires: audit-libs >= %{libauditver}
 # how well this will work with generic logos, though
 Requires: system-icon-theme
 
+# Upstream 64e6b10f98fe7226a2f41807268dae3afa80236d : check for
+# gnome-shell before using it to do login (RH #743596)
+Patch0: gdm-3.2.0-shell_check.patch
+
 # Fedora-specific
 Patch98: plymouth.patch
 Patch99: gdm-3.0.0-fedora-logo.patch
@@ -148,6 +152,7 @@ Development files and headers for writing GDM greeters.
 
 %prep
 %setup -q
+%patch0 -p1 -b .shell-check
 %patch98 -p1 -b .plymouth
 %patch99 -p1 -b .fedora-logo
 
@@ -406,6 +411,10 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/gdm/simple-greeter/extensions/libfingerprint.so
 
 %changelog
+* Wed Oct  5 2011 Adam Williamson <awilliam at redhat.com> - 1:3.2.0-2
+- shell_check.patch (upstream): re-add check for gnome-shell presence
+  before using it to handle login (RH #743596)
+
 * Wed Sep 28 2011 Ray <rstrode at redhat.com> - 1:3.2.0-1
 - Update to 3.2.0