packages: openldap/openldap.spec - rel 2 - solved problems with nssov ldapn...

[baggins]

Author: baggins                      Date: Thu Jan 14 13:12:46 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 2
- solved problems with nssov ldapns.schema, reenabled triggers

---- Files affected:
packages/openldap:
   openldap.spec (1.330 -> 1.331) 

---- Diffs:

================================================================
Index: packages/openldap/openldap.spec
diff -u packages/openldap/openldap.spec:1.330 packages/openldap/openldap.spec:1.331
--- packages/openldap/openldap.spec:1.330	Wed Jan 13 16:26:15 2010
+++ packages/openldap/openldap.spec	Thu Jan 14 14:12:41 2010
@@ -32,7 +32,7 @@
 Summary(uk.UTF-8):	Зразки клієнтів LDAP
 Name:		openldap
 Version:	2.4.21
-Release:	1
+Release:	2
 License:	OpenLDAP Public License
 Group:		Networking/Daemons
 Source0:	ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/%{name}-%{version}.tgz
@@ -629,6 +629,7 @@
 Group:		Networking/Daemons
 Requires(post,preun):	sed >= 4.0
 Requires:	%{name}-servers = %{version}-%{release}
+Conflicts:	openldap-schema-pam_ldap
 
 %description overlay-nssov
 The nssov overlay handles NSS lookup requests through a local Unix
@@ -1428,7 +1429,6 @@
 %preun overlay-memberof
 %ldap_module_remove memberof.la
 
-%if 0
 %post overlay-nssov
 %ldap_module_add nssov.la
 %openldap_schema_register %{schemadir}/ldapns.schema
@@ -1442,7 +1442,6 @@
 	%openldap_schema_unregister %{schemadir}/ldapns.schema
 	%service -q ldap restart
 fi
-%endif
 
 %post overlay-ppolicy
 %ldap_module_add ppolicy.la
@@ -1849,6 +1848,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.331  2010/01/14 13:12:41  baggins
+- rel 2
+- solved problems with nssov ldapns.schema, reenabled triggers
+
 Revision 1.330  2010/01/13 15:26:15  baggins
 - 2.4.21
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/openldap/openldap.spec?r1=1.330&r2=1.331&f=u