rpms/gdm
5
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source
This commit is contained in:
Adam Williamson 2011-10-05 15:43:59 -07:00
parent 5ed0dbc6a7
commit d22026c930
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gdm-3.2.0-shell_check.patch Normal file
View File

@ -0,0 +1,29 @@
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
---
(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

10
gdm.spec
View File

@ -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,9 @@ Requires: system-icon-theme
Patch0: fix-build.patch
Patch1: disable-fatal-criticals.patch
# Upstream 64e6b10f98fe7226a2f41807268dae3afa80236d : check for
# gnome-shell before using it to do login (RH #743596)
Patch2: gdm-3.2.0-shell_check.patch
# Fedora-specific
Patch98: plymouth.patch
@ -130,6 +133,7 @@ The GDM fingerprint plugin provides functionality necessary to use a fingerprint
%setup -q
%patch0 -p1 -b .fix-build
%patch1 -p1 -b .disable-fatal-criticals
%patch2 -p1 -b .shell-check
%patch98 -p1 -b .plymouth
%patch99 -p1 -b .fedora-logo
@ -364,6 +368,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@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@redhat.com> - 1:3.2.0-1
- Update to 3.2.0