rpms/kdebase-workspace/devel kde.pam, NONE, 1.1 kdm.pam, NONE, 1.1 kdebase-workspace.spec, 1.7, 1.8

[Than Ngo (than)]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28592

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kde.pam kdm.pam 
Log Message:
fix kdm/kcheckpass/kscreensaver to get working



--- NEW FILE kde.pam ---
#%PAM-1.0
auth       include     system-auth
account    required	pam_nologin.so
account    include     system-auth
password   include     system-auth
session    include	system-auth
session    required    pam_loginuid.so
session    optional    pam_selinux.so
session    optional	pam_console.so


--- NEW FILE kdm.pam ---
#%PAM-1.0
auth       include     system-auth
account    required    pam_nologin.so
account    include     system-auth
password   include     system-auth
session    optional    pam_keyinit.so force revoke
session    include     system-auth
session    required    pam_loginuid.so
session    optional    pam_selinux.so
session    optional    pam_console.so


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/devel/kdebase-workspace.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- kdebase-workspace.spec	4 Dec 2007 13:17:08 -0000	1.7
+++ kdebase-workspace.spec	4 Dec 2007 13:27:54 -0000	1.8
@@ -2,25 +2,26 @@
 # FIXME, currently incompat with nm >= 0.7
 %define _without_nm -DWITH_NetworkManager=off
 
-Summary:        K Desktop Environment - Workspace
-Name:           kdebase-workspace
-Version:        3.96.2
-
-Release:        3%{?dist}
-Source0:        ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2
-
-License:        GPLv2
-Group:          User Interface/Desktops
-URL:            http://www.kde.org/
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch0:         kdebase-workspace-3.96.0-plasma-pager.diff
-Patch1:         kdebase-workspace-3.96.1-redhat-startkde.patch
-Patch2:         kdebase-workspace-3.96.2-consolekit-kdm.patch
+Summary: K Desktop Environment - Workspace
+Name: kdebase-workspace
+Version: 3.96.2
+
+Release: 3%{?dist}
+Source0: ftp://ftp.kde.org/pub/kde/unstable/3.96.1/src/kdebase-workspace-%{version}.tar.bz2
+Source1: kdm.pam
+Source2: kde.pam
+License: GPLv2
+Group: User Interface/Desktops
+URL: http://www.kde.org/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+Patch0: kdebase-workspace-3.96.0-plasma-pager.diff
+Patch1: kdebase-workspace-3.96.1-redhat-startkde.patch
+Patch2: kdebase-workspace-3.96.2-consolekit-kdm.patch
 
 # upgrade path for former kde-redhat'ers
 Obsoletes: kdebase-kdm < 6:%{version}-%{release}
-Provides:  kdebase-kdm = 6:%{version}-%{release}
+Provides: kdebase-kdm = 6:%{version}-%{release}
 
 BuildRequires: bluez-libs-devel
 BuildRequires: cmake
@@ -108,6 +109,11 @@
 
 make install DESTDIR=%{buildroot} -C %{_target_platform}
 
+# pam
+mkdir -p %{buildroot}/etc/pam.d/
+install -p -m 644 %{SOURCE1} %{buildroot}/etc/pam.d/kdm
+install -p -m 644 %{SOURCE2} %{buildroot}/etc/pam.d/kde
+
 # xsession support
 mkdir -p %{buildroot}%{_datadir}/xsessions/
 ln -s %{_kde4_appsdir}/kdm/sessions/kde.desktop %{buildroot}%{_datadir}/xsessions/kde.desktop
@@ -160,6 +166,7 @@
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
+%config(noreplace) /etc/pam.d/*
 %config(noreplace) %{_kde4_sysconfdir}/ksysguarddrc
 # FIXME/TODO: Consider %config(noreplace)
 %config %{_kde4_sysconfdir}/systemsettingsrc