- small changes in pam file

- use gdm.pamd for gdm-password
- require compatible window manager
- suggests pam_gnome_keyring
- rel. 3

Changed files:
    gdm.pamd -> 1.12
    gdm.spec -> 1.283

diff --git a/gdm.pamd b/gdm.pamd
index 95c562ce64b9d0805905c29ddc5a112c08525bef..1fab2b8105b0ec103dc1f30ac00a08aca3565e7e 100644 (file)
--- a/gdm.pamd
+++ b/gdm.pamd
@@ -1,13 +1,13 @@
 #%PAM-1.0
 auth           required        pam_listfile.so item=user sense=deny file=/etc/security/blacklist.gdm onerr=succeed
 auth           include         system-auth
-auth           optional        pam_gnome_keyring.so
+auth           optional        pam_gnome_keyring.so try_first_pass
 account                required        pam_shells.so
 account                required        pam_nologin.so
 account                required        pam_access.so
 account                include         system-auth
 password       include         system-auth
 session                optional        pam_keyinit.so force revoke
-session                include         system-auth
 session                optional        pam_console.so
 session                optional        pam_gnome_keyring.so auto_start
+session                include         system-auth

diff --git a/gdm.spec b/gdm.spec
index 2c673dbe249833a3667caf0fb0316828a0518683..5a732a3ff8e862c6740eadd9b165b2155d420c7c 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.1.1
-Release:       2
+Release:       3
 Epoch:         2
 License:       GPL/LGPL
 Group:         X11/Applications
@@ -86,6 +86,7 @@ Requires:     /usr/bin/X
 Requires:      ConsoleKit-x11 >= 0.4.1
 Requires:      accountsservice >= 0.6.12
 Requires:      dbus-x11
+Requires:      gdm-wm >= 3.2.1
 Requires:      gnome-session >= 2.91.91.1
 Requires:      gnome-settings-daemon >= 2.91.91
 Requires:      hicolor-icon-theme
@@ -94,6 +95,7 @@ Requires:     polkit-gnome >= 0.93
 Requires:      which
 Requires:      xorg-app-sessreg
 Requires:      xorg-app-xmodmap
+Suggests:      pam-pam_gnome_keyring
 Suggests:      zenity
 Provides:      XDM
 Provides:      group(xdm)
@@ -249,6 +251,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,pam.d,security,init} \
        PAM_PREFIX=/etc
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm
+cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/pam.d/gdm-password
 cp -p %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/gdm-autologin
 install -p %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/gdm
 cp -p %{SOURCE7} $RPM_BUILD_ROOT/etc/init/%{name}.conf