rpms/authconfig/devel authconfig-6.1.4-ldap-packages.patch, NONE, 1.1 authconfig.spec, 1.122, 1.123

[Tomáš Mráz]

Author: tmraz

Update of /cvs/pkgs/rpms/authconfig/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25028

Modified Files:
	authconfig.spec 
Added Files:
	authconfig-6.1.4-ldap-packages.patch 
Log Message:
* Thu Jun 10 2010 Tomas Mraz <tmraz at redhat.com> - 6.1.6-1
- remove superfluous space in nsswitch.conf (#595265)
- always write to 'default' domain in sssd.conf only (#598558)
- update pam and nsswitch config only when needed


authconfig-6.1.4-ldap-packages.patch:
 authconfig.py |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE authconfig-6.1.4-ldap-packages.patch ---
diff -r 0f3b95c86b85 authconfig.py
--- a/authconfig.py	Tue Jun 22 16:45:38 2010 +0000
+++ b/authconfig.py	Mon Jul 12 16:01:28 2010 +0200
@@ -522,8 +522,8 @@
 		warnCache = [authinfo.PATH_NSCD, _("caching"), "nscd", None]
 		warnFprintd = [authinfo.PATH_PAM_FPRINTD, _("Fingerprint reader"), "pam_fprintd", None]
 		warnKerberos = [authinfo.PATH_PAM_KRB5, _("Kerberos"), "pam_krb5", None]
-		warnLDAPAuth = [authinfo.PATH_PAM_LDAP, _("LDAP authentication"), "nss_ldap", None]
-		warnLDAP = [authinfo.PATH_LIBNSS_LDAP, _("LDAP"), "nss_ldap", None]
+		warnLDAPAuth = [authinfo.PATH_PAM_LDAP, _("LDAP authentication"), "pam_ldap", None]
+		warnLDAP = [authinfo.PATH_LIBNSS_LDAP, _("LDAP"), "nss-pam-ldapd", None]
 		warnNIS = [authinfo.PATH_YPBIND, _("NIS"), "ypbind", None]
 		warnShadow = [authinfo.PATH_PWCONV, _("shadow password"), "shadow-utils", None]
 		warnWinbindNet = [authinfo.PATH_WINBIND_NET, _("Winbind"), "samba-client", None]


Index: authconfig.spec
===================================================================
RCS file: /cvs/pkgs/rpms/authconfig/devel/authconfig.spec,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -p -r1.122 -r1.123
--- authconfig.spec	10 Jun 2010 15:38:51 -0000	1.122
+++ authconfig.spec	12 Jul 2010 14:27:28 -0000	1.123
@@ -1,13 +1,14 @@
 Summary: Command line tool for setting up authentication from network services
 Name: authconfig
 Version: 6.1.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 ExclusiveOS: Linux
 Group: System Environment/Base
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL: https://fedorahosted.org/authconfig
 Source: https://fedorahosted.org/releases/a/u/%{name}/%{name}-%{version}.tar.bz2
+Patch1: authconfig-6.1.4-ldap-packages.patch
 Requires: newt-python, pam >= 0.99.10.0, python
 Conflicts: pam_krb5 < 1.49, samba-common < 3.0, samba-client < 3.0
 Conflicts: nss_ldap < 254, sssd < 0.99.1
@@ -34,6 +35,7 @@ authentication schemes.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .ldap-packages
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fPIC"; export CFLAGS
@@ -110,6 +112,9 @@ authconfig --update --nostart >/dev/null
 %{_datadir}/icons/hicolor/48x48/apps/system-config-authentication.*
 
 %changelog
+* Mon Jul 12 2010 Tomas Mraz <tmraz at redhat.com> - 6.1.6-2
+- use current ldap packages in the warnings
+
 * Thu Jun 10 2010 Tomas Mraz <tmraz at redhat.com> - 6.1.6-1
 - remove superfluous space in nsswitch.conf (#595265)
 - always write to 'default' domain in sssd.conf only (#598558)