From aa8b093331078225411b74cce143576af30678e2 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@fedoraproject.org>
Date: Wed, 3 Oct 2007 14:17:27 +0000
Subject: [PATCH] - Fix up pam keyring integration to be what the latest
 version of the docs     says

---
 gdm-pam  | 4 ++--
 gdm.spec | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/gdm-pam b/gdm-pam
index cbe994b..095dff2 100644
--- a/gdm-pam
+++ b/gdm-pam
@@ -1,7 +1,7 @@
 #%PAM-1.0
 auth       required    pam_env.so
 auth       include     system-auth
-auth       optional    pam_gnome_keyring.so auto_start
+auth       optional    pam_gnome_keyring.so
 account    required    pam_nologin.so
 account    include     system-auth
 password   include     system-auth
@@ -11,5 +11,5 @@ session    include     system-auth
 session    required    pam_loginuid.so
 session    optional    pam_console.so
 session    required    pam_selinux.so open
-session    optional    pam_gnome_keyring.so
+session    optional    pam_gnome_keyring.so auto_start
 
diff --git a/gdm.spec b/gdm.spec
index 217076f..c5daad7 100644
--- a/gdm.spec
+++ b/gdm.spec
@@ -16,7 +16,7 @@
 Summary: The GNOME Display Manager
 Name: gdm
 Version: 2.20.0
-Release: 13%{?dist}
+Release: 14%{?dist}
 Epoch: 1
 License: GPLv2+
 Group: User Interface/X
@@ -373,6 +373,10 @@ fi
 %{_datadir}/pixmaps/faces/extras/*.jpg
 
 %changelog
+* Tue Oct  3 2007 Alexander Larsson <alexl@redhat.com> - 1:2.20.0-14
+- Fix up pam keyring integration to be what the latest version
+  of the docs says
+
 * Tue Oct  2 2007 Ray Strode <rstrode@redhat.com> - 1:2.20.0-13
 - Actually add said escape == cancel behavior back