--- rpms/e-smith-base/sme8/e-smith-base.spec	2010/06/11 07:39:39	1.94
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/09/23 14:59:41	1.99
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.93 2010/06/08 19:43:47 snetram Exp $
+# $Id: e-smith-base.spec,v 1.98 2010/08/08 08:08:32 wellsi Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 24
+%define release 29
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,6 +29,11 @@ Patch16: e-smith-base-5.2.0-gettext.patc
 Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
 Patch18: e-smith-base-5.2.0-no-nic.patch
 Patch19: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
+Patch20: e-smith-base-5.2.0-freebusy-user-modify-fix.patch
+Patch21: e-smith-base-5.2.0-condrestart.patch
+Patch22: e-smith-base-5.2.0-condrestart.patch2
+Patch23: e-smith-base-5.2.0-cpuspeed.patch
+Patch24: e-smith-base-5.2.0-nss_ldap.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
@@ -55,6 +60,7 @@ Requires: e-smith-bootloader
 Requires: mdadm
 Requires: pv
 Requires: pam_abl
+Requires: nss_ldap
 Obsoletes: rlinetd, e-smith-mod_ssl
 Obsoletes: e-smith-serial-console
 Obsoletes: sshell
@@ -74,6 +80,22 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
+- Prepare nss_ldap [SME: 6227]
+
+* Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
+- Enable cpuspeed by default [SME: 6066]
+
+* Sun Jul 25 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-27.sme
+- Fix syntax error in last patch. [SME: 5830]
+
+* Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.2.0-26.sme
+- Don't exit 99 from e-smith-service script when called with 'condrestart'
+  and service is disabled. [SME: 5830]
+
+* Fri Jun 11 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-25.sme
+- FreeBusy patch fix (save account changes) [SME: 5941]
+
 * Fri Jun 11 2010 Ian Wells <esmith@wellsi.com>  5.2.0-24.sme
 - Remove checkMaxUsers patch due to regression. [SME: 5537] 
 
@@ -1384,6 +1406,11 @@ e-smith server and gateway software - ba
 %patch17 -p1
 %patch18 -p1
 %patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
@@ -1463,6 +1490,9 @@ mkdir -p root/etc/e-smith/templates/etc/
 ln -s /etc/e-smith/templates-default/template-begin-shell \
       root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
 
+mkdir -p root/etc/e-smith/templates/etc/ldap.secret/
+touch root/etc/e-smith/templates/etc/ldap.secret/template-begin
+
 for file in imap login passwd pwauth system-auth
 do
     mkdir -p root/etc/e-smith/templates/etc/pam.d/$file