--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/04/28 22:26:29	1.11
+++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/08/07 20:30:05	1.19
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base+ldap
 Name: %{name}
 %define version 4.19.1
-%define release 13
+%define release 21
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -21,6 +21,13 @@ Patch10: e-smith-base+ldap-4.19.1-import
 Patch11: e-smith-base-4.18.1-dateManip.patch
 Patch12: e-smith-base-4.18.1-ethernetlist.patch
 Patch13: e-smith-base-4.18.1-add2general.patch
+Patch14: e-smith-base+ldap-4.19.1-change_domain_name.patch
+Patch15: e-smith-base+ldap-4.19.1-freebusy.patch2
+Patch16: e-smith-base+ldap-4.19.1-add2general.patch
+Patch17: e-smith-base+ldap-4.19.1-get_raid_details_cciss.patch
+Patch18: e-smith-base+ldap-4.19.1-merge_users_and_people.patch
+Patch19: e-smith-base+ldap-4.19.1-2739schema.patch
+Patch20: e-smith-base-4.18.1-PortFixesFromBase.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -77,6 +84,41 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-21
+- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it
+  to e-smith-formmagick's general [SME: 4475]
+- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
+- Remove invalid entry tag from userpassword's locale file preventing the
+  form from displaying properly [SME: 4479]
+
+* Fri Jul 25 2008 Shad L. Lords <slords@mail.com> 4.19.1-20
+- Separate template to avoid breaking schema [SME: 4171]
+
+* Fri Jul 25 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-19
+- Merge Users and People informations in ou=Users. This is done by removing
+  the 'account' objectClass and adding 'calEntry' and 'InetOrgPerson' for 
+  user accounts [SME: 4396]
+- do not reset objectClass attributes during ldap-update. This will allow
+  admins to add others objectClass
+- use the dummy user (inetOrgPerson) of each group to store mail address
+  of the group (may store alias latter)
+- remove now unused ou=People
+- rotate slapd log in logrotate event
+- compute sambaSID of users, prevent invalid sambaSID during migration
+
+* Wed Jul 23 2008 Gavin Weight <gweight@gmail.com> 4.19.1-18
+- Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-17
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
+* Thu May 14 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-16
+- Add calEntry in ldap-update so the attribute calFBURL is allowed and 
+  ou=People can be updated
+
+* Mon Apr 28 2008 Daniel B. <daniel@firewall-services.com> 4.19.1-15
+- Fix run script when domain name has changed
+
 * Mon Apr 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-14
 - Add common <base> tags to e-smith-formmagick's general [SME: 4279]
 
@@ -1145,6 +1187,13 @@ e-smith server and gateway software - ba
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]