rpms/kde-settings/devel kde.pam, NONE, 1.1 kdm.pam, NONE, 1.1 kde-settings.spec, 1.17, 1.18

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-settings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv6192

Modified Files:
	kde-settings.spec 
Added Files:
	kde.pam kdm.pam 
Log Message:
* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0-3
- include pam configs
- -pulseaudio: Requires: xine-lib-extras



--- 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: kde-settings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-settings/devel/kde-settings.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- kde-settings.spec	4 Dec 2007 14:09:02 -0000	1.17
+++ kde-settings.spec	6 Dec 2007 01:28:50 -0000	1.18
@@ -4,18 +4,22 @@
 Summary: Config files for kde
 Name:    kde-settings
 Version: 4.0
-Release: %{rel}%{?dist}
+Release: 3%{?dist}
 
 Group:   System Environment/Base
 License: Public Domain
 # This is a package which is specific to our distribution.  
 # Thus the source is only available from within this srpm.
 Source0: kde-settings-%{version}-%{rel}.tar.bz2
-Source1: pulseaudio.sh
+Source1: kdm.pam
+Source2: kde.pam
+Source3: pulseaudio.sh
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
 Requires: kde-filesystem
+# /etc/pam.d/ ownership
+Requires: pam
 Requires: xdg-user-dirs
 
 Obsoletes: kde-config < %{version}-%{release}
@@ -24,7 +28,7 @@
 %{summary}.
 
 %package kdm
-Summary: Config files for kdebase(kdm)
+Summary: Config files for kdebase-workspace(kdm)
 Group:	 System Environment/Base
 Obsoletes: kde-config-kdm < %{version}-%{release}
 Requires: kdebase-kdm >= %{version}
@@ -43,14 +47,15 @@
 %{summary}.
 
 %package pulseaudio
-Summary: Enable pulseaudio support
+Summary: Enable pulseaudio support in KDE
 Group:   System Environment/Base
 Requires: %{name} = %{version}-%{release}
-Requires: alsa-plugins-pulseaudio
 Requires: pulseaudio
-# +pulseaudio-utils until http://bugzilla.redhat.com/349751 fixed
-Requires: pulseaudio-module-x11 pulseaudio-utils
-#Requires: xine-lib-extras
+Requires: pulseaudio-module-x11
+# kde3
+Requires: alsa-plugins-pulseaudio
+# kde4, xine-lib pulseaudio support
+Requires: xine-lib-extras
 %description pulseaudio
 %{summary}.
 
@@ -71,8 +76,13 @@
 rm -rf   %{buildroot}%{_datadir}/config/kdm
 ln -sf ../../../etc/kde/kdm %{buildroot}%{_datadir}/config/kdm
 
+# pam
+install -p -m644 -D %{SOURCE1} %{buildroot}/etc/pam.d/kdm
+install -p -m644 -D %{SOURCE2} %{buildroot}/etc/pam.d/kcheckpass
+install -p -m644 -D %{SOURCE2} %{buildroot}/etc/pam.d/kscreensaver
+
 # pulseaudio (auto)start
-install -p -m755 -D %{SOURCE1} %{buildroot}%{_sysconfdir}/kde/env/pulseaudio.sh
+install -p -m755 -D %{SOURCE3} %{buildroot}%{_sysconfdir}/kde/env/pulseaudio.sh
 
 
 %clean
@@ -95,9 +105,10 @@
   %{__cp} -a %{_sysconfdir}/kde/kdm/kdmrc.rpmnew %{_sysconfdir}/kde/kdm/kdmrc ||:
 
 
-
 %files 
 %defattr(-,root,root,-)
+%config(noreplace) /etc/pam.d/kcheckpass
+%config(noreplace) /etc/pam.d/kscreensaver
 %{_sysconfdir}/skel/.kde/
 # drop noreplace, so we can be sure to get the new kiosk bits
 %config %{_sysconfdir}/kderc
@@ -105,6 +116,7 @@
 
 %files kdm
 %defattr(-,root,root,-)
+%config(noreplace) /etc/pam.d/kdm
 #%{_sysconfdir}/kde/env/xdg_*-hack.sh
 # compat symlink
 %{_datadir}/config/kdm
@@ -127,6 +139,10 @@
 
 
 %changelog
+* Wed Dec 05 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4.0-3
+- include pam configs
+- -pulseaudio: Requires: xine-lib-extras
+
 * Tue Dec 04 2007 Than Ngo <than at redhat.com> 4.0-2
 - kdmrc: circles as kdm default theme