packages: gdm/gdm.spec, gdm/shell-check.patch (NEW) - added patch to fix ht...

[kiesiu]

Author: kiesiu                       Date: Sun Oct 16 20:51:42 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- added patch to fix https://bugzilla.gnome.org/show_bug.cgi?id=660409
- rel. 4

---- Files affected:
packages/gdm:
   gdm.spec (1.279 -> 1.280) , shell-check.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.279 packages/gdm/gdm.spec:1.280
--- packages/gdm/gdm.spec:1.279	Sun Oct  2 20:08:55 2011
+++ packages/gdm/gdm.spec	Sun Oct 16 22:51:37 2011
@@ -16,7 +16,7 @@
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
 Version:	3.2.0
-Release:	3
+Release:	4
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
@@ -33,6 +33,8 @@
 Patch1:		%{name}-polkit.patch
 Patch2:		%{name}-xsession.patch
 Patch3:		%{name}-defaults.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=660409
+Patch4:		shell-check.patch
 URL:		http://www.gnome.org/projects/gdm/
 BuildRequires:	GConf2-devel >= 2.32.0
 BuildRequires:	accountsservice-devel >= 0.6.12
@@ -210,6 +212,7 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 touch data/gdm.schemas.in.in
@@ -409,6 +412,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.280  2011/10/16 20:51:37  kiesiu
+- added patch to fix https://bugzilla.gnome.org/show_bug.cgi?id=660409
+- rel. 4
+
 Revision 1.279  2011/10/02 18:08:55  kiesiu
 - use ldconfig only in -libs post/postun
 

================================================================
Index: packages/gdm/shell-check.patch
diff -u /dev/null packages/gdm/shell-check.patch:1.1
--- /dev/null	Sun Oct 16 22:51:43 2011
+++ packages/gdm/shell-check.patch	Sun Oct 16 22:51:37 2011
@@ -0,0 +1,26 @@
+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
+---
+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
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/gdm.spec?r1=1.279&r2=1.280&f=u