packages: gdm/gdm.spec, gdm/shell-check.patch - up to 3.2.1.1 - reduce shel...

[wiget]

Author: wiget                        Date: Wed Oct 19 17:41:07 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.2.1.1
- reduce shell-check.patch to bash -> sh change

---- Files affected:
packages/gdm:
   gdm.spec (1.280 -> 1.281) , shell-check.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/gdm/gdm.spec
diff -u packages/gdm/gdm.spec:1.280 packages/gdm/gdm.spec:1.281
--- packages/gdm/gdm.spec:1.280	Sun Oct 16 22:51:37 2011
+++ packages/gdm/gdm.spec	Wed Oct 19 19:41:02 2011
@@ -15,13 +15,13 @@
 Summary(ru.UTF-8):	Дисплейный менеджер GNOME
 Summary(uk.UTF-8):	Дисплейний менеджер GNOME
 Name:		gdm
-Version:	3.2.0
-Release:	4
+Version:	3.2.1.1
+Release:	1
 Epoch:		2
 License:	GPL/LGPL
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/gdm/3.2/%{name}-%{version}.tar.xz
-# Source0-md5:	34819420a3177fe18eac2154762ed996
+# Source0-md5:	df3f38061066f5e0816676b4eef7854a
 Source1:	%{name}.pamd
 Source2:	%{name}.init
 Source3:	%{name}-pld-logo.png
@@ -33,7 +33,6 @@
 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
@@ -346,7 +345,7 @@
 %config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/gdm*
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.gdm
-%{_sysconfdir}/dconf/db/gdm
+%{_sysconfdir}/dconf/db/gdm.d
 %{_sysconfdir}/dconf/profile/gdm
 %attr(1755,root,xdm) %dir /var/cache/gdm
 %attr(1770,root,xdm) %dir /var/gdm
@@ -412,6 +411,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.281  2011/10/19 17:41:02  wiget
+- up to 3.2.1.1
+- reduce shell-check.patch to bash -> sh change
+
 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

================================================================
Index: packages/gdm/shell-check.patch
diff -u packages/gdm/shell-check.patch:1.2 packages/gdm/shell-check.patch:1.3
--- packages/gdm/shell-check.patch:1.2	Mon Oct 17 14:52:04 2011
+++ packages/gdm/shell-check.patch	Wed Oct 19 19:41:02 2011
@@ -1,26 +1,9 @@
-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
+--- gdm-3.2.1.1/data/gdm-shell.session.in.wiget	2011-10-19 19:38:06.384218726 +0200
++++ gdm-3.2.1.1/data/gdm-shell.session.in	2011-10-19 19:38:45.769335146 +0200
 @@ -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'
 +IsRunnableHelper=sh -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.280&r2=1.281&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gdm/shell-check.patch?r1=1.2&r2=1.3&f=u