packages: systemd/systemd.spec - rel 4 - C:pam without pam_systemd.so in sy...

[baggins]

Author: baggins                      Date: Sun Feb 12 12:25:20 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 4
- C:pam without pam_systemd.so in system-auth

---- Files affected:
packages/systemd:
   systemd.spec (1.110 -> 1.111) 

---- Diffs:

================================================================
Index: packages/systemd/systemd.spec
diff -u packages/systemd/systemd.spec:1.110 packages/systemd/systemd.spec:1.111
--- packages/systemd/systemd.spec:1.110	Sat Feb 11 10:50:07 2012
+++ packages/systemd/systemd.spec	Sun Feb 12 13:25:15 2012
@@ -17,7 +17,7 @@
 Summary(pl.UTF-8):	systemd - zarządca systemu i usług dla Linuksa
 Name:		systemd
 Version:	39
-Release:	3
+Release:	4
 License:	GPL v2+
 Group:		Base
 Source0:	http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz
@@ -86,6 +86,8 @@
 Provides:	udev-acl
 # systemd takes care of that and causes problems
 Conflicts:	binfmt-detector
+# sytemd wants pam with pam_systemd.so in system-auth 
+Conflicts:	pam < 1:1.1.5-5
 Conflicts:	upstart
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -251,7 +253,6 @@
 Conflicts:	openldap-overlay-nssov < 2.4.28-4
 Conflicts:	openldap-servers < 2.4.28-4
 Conflicts:	openvpn < 2.2.2-2
-Conflicts:	pam < 1:1.1.5-3
 Conflicts:	pam-pam_mount < 2.12-3
 Conflicts:	pam-pam_ssh < 1.97-2
 Conflicts:	pcsc-lite < 1.8.1-2
@@ -682,6 +683,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.111  2012/02/12 12:25:15  baggins
+- rel 4
+- C:pam without pam_systemd.so in system-auth
+
 Revision 1.110  2012/02/11 09:50:07  glen
 - be precise
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/systemd/systemd.spec?r1=1.110&r2=1.111&f=u