--- rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2010/12/01 19:24:58 1.84 +++ rpms/e-smith-ldap/sme8/e-smith-ldap.spec 2011/03/14 15:27:20 1.88 @@ -1,10 +1,10 @@ -# $Id: e-smith-ldap.spec,v 1.83 2010/12/01 03:43:48 slords Exp $ +# $Id: e-smith-ldap.spec,v 1.87 2010/12/02 00:46:05 slords Exp $ Summary: e-smith server and gateway - LDAP module %define name e-smith-ldap Name: %{name} %define version 5.2.0 -%define release 72 +%define release 75 Version: %{version} Release: %{release}%{?dist} License: GPL @@ -76,6 +76,8 @@ Patch62: e-smith-ldap-5.2.0-ldapmodify.p Patch63: e-smith-ldap-5.2.0-fix-department.patch Patch64: e-smith-ldap-5.2.0-update-ldap-later.patch Patch65: e-smith-ldap-5.2.0-ldap-init.patch +Patch66: e-smith-ldap-5.2.0-replace-logic.patch +Patch67: e-smith-ldap-5.2.0-dont_set_gecos_in_ldap.patch BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot BuildArchitectures: noarch Requires: e-smith-base @@ -91,6 +93,15 @@ AutoReqProv: no e-smith server and gateway software - LDAP module. %changelog +* Mon Mar 14 2011 Daniel Berteaud 5.2.0-75.sme +- Stop using gecos attribute in LDAP [SME: 6539] + +* Wed Dec 1 2010 Shad L. Lords 5.2.0-74.sme +- Fix replace logic in ldif-fix [SME: 6423] + +* Wed Dec 1 2010 Shad L. Lords 5.2.0-73.sme +- Fix permissions on ldif-fix script [SME: 6244] + * Wed Dec 1 2010 Shad L. Lords 5.2.0-72.sme - Replace convert_ldif with ldif-fix script [SME: 6244] - Remove ldif template and expansion [SME: 6421] @@ -1031,6 +1042,8 @@ e-smith server and gateway software - LD %patch63 -p1 %patch64 -p1 %patch65 -p1 +%patch66 -p1 +%patch67 -p1 %build mkdir -p root/etc/e-smith/tests @@ -1056,7 +1069,7 @@ rm -f %{name}-%{version}-%{release}-file /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \ --file /var/service/ldap/run 'attr(0750,root,root)' \ --file /var/service/ldap/log/run 'attr(0750,root,root)' \ - --file /var/service/ldap/convert_ldif 'attr(0750,root,root)' \ + --file /var/service/ldap/ldif-fix 'attr(0750,root,root)' \ --file /var/service/ldap/finish 'attr(0750,root,root)' \ --file /var/service/ldap/control/1 'attr(0750,root,root)' \ --dir /var/log/bdb 'attr(0700,ldap,ldap)' \