- added patch to fix https://bugzilla.gnome.org/show_bug.cgi?id=660409

- rel. 4

Changed files:
    gdm.spec -> 1.280
    shell-check.patch -> 1.1

diff --git a/gdm.spec b/gdm.spec
index 436e7725ebfbe82d62f495104b776e49cdd87a19..c3745d156df64dbf4b49f6e53d9e9682dcdde0a0 100644 (file)
--- a/gdm.spec
+++ b/gdm.spec
@@ -15,7 +15,7 @@ Summary(ru.UTF-8):    Дисплейный менеджер GNOME
 Summary(uk.UTF-8):     Дисплейний менеджер GNOME
 Name:          gdm
 Version:       3.2.0
-Release:       3
+Release:       4
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
@@ -32,6 +32,8 @@ Patch0:               %{name}-xdmcp.patch
 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
@@ -209,6 +211,7 @@ Opis zadania Upstart dla GDM.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 touch data/gdm.schemas.in.in

diff --git a/shell-check.patch b/shell-check.patch
new file mode 100644 (file)
index 0000000..f3ac9cf
--- /dev/null
+++ b/shell-check.patch
@@ -0,0 +1,26 @@
+From 64e6b10f98fe7226a2f41807268dae3afa80236d Mon Sep 17 00:00:00 2001
+From: György Balló <ballogy@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