[gdm] Fix gnome-shell detection

[Matthias Clasen]

commit 5313634de07a474d07ea258ea49ede9b70ee8824
Author: Matthias Clasen <mclasen at redhat.com>
Date:   Sat Jun 9 12:27:32 2012 -0400

    Fix gnome-shell detection

 ...ly-remove-the-gdm-mode-commandline-option.patch |   24 ++++++++++++++++++++
 gdm.spec                                           |    9 ++++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Really-remove-the-gdm-mode-commandline-option.patch b/0001-Really-remove-the-gdm-mode-commandline-option.patch
new file mode 100644
index 0000000..99c63fc
--- /dev/null
+++ b/0001-Really-remove-the-gdm-mode-commandline-option.patch
@@ -0,0 +1,24 @@
+From b6499b7130e5c762daf571e49187169c8d0e5e43 Mon Sep 17 00:00:00 2001
+From: Matthias Clasen <mclasen at redhat.com>
+Date: Sat, 9 Jun 2012 12:24:45 -0400
+Subject: [PATCH] Really remove the --gdm-mode commandline option
+
+Command 38b2df058c9d0237a6398675ca6401cf2b043015 was incomplete.
+---
+ data/gdm-shell.session.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/gdm-shell.session.in b/data/gdm-shell.session.in
+index 496cc10..172f5e0 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=bash -c 'gnome-shell --help | grep -q gdm-mode && @libexecdir@/gnome-session-check-accelerated'
++IsRunnableHelper=bash -c 'gnome-shell --help | grep -q gdm && @libexecdir@/gnome-session-check-accelerated'
+ FallbackSession=gdm-fallback
+-- 
+1.7.10.2
+
diff --git a/gdm.spec b/gdm.spec
index 34347f1..44ad935 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -14,7 +14,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 3.5.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -32,6 +32,9 @@ Source8: gdm-fingerprint-16.png
 Source9: gdm-fingerprint-48.png
 Source10: org.gnome.login-screen.gschema.override
 
+# upstream fix
+Patch0: 0001-Really-remove-the-gdm-mode-commandline-option.patch
+
 Requires(pre): /usr/sbin/useradd
 
 Requires: pam >= 0:%{pam_version}
@@ -127,6 +130,7 @@ Development files and headers for writing GDM greeters.
 
 %prep
 %setup -q
+%patch0 -p1
 
 autoreconf -i -f
 
@@ -370,6 +374,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || :
 %{_libdir}/girepository-1.0/GdmGreeter-1.0.typelib
 
 %changelog
+* Sat Jun  9 2012 Matthias Clasen <mclasen at redhat.com> - 1:3.5.2-2
+- Fix gnome-shell detection
+
 * Thu Jun 07 2012 Richard Hughes <hughsient at gmail.com> - 1:3.5.2-1
 - Update to 3.5.2