--- rpms/e-smith-base/sme8/e-smith-base.spec	2010/10/11 17:19:05	1.104
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/11/02 17:19:26	1.109
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.103 2010/10/08 17:01:43 slords Exp $
+# $Id: e-smith-base.spec,v 1.108 2010/10/14 16:21:30 vip-ire Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 34
+%define release 41
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -39,6 +39,13 @@ Patch26: e-smith-base-5.2.0-keep_externa
 Patch27: e-smith-base-5.2.0-checkMaxUsers.patch
 Patch28: e-smith-base-5.2.0-apmd64bit.patch
 Patch29: e-smith-base-5.2.0-relocate_dhclient_conf.patch
+Patch30: e-smith-base-5.2.0-echo-options.patch
+Patch31: e-smith-base-5.2.0-migrateHWaddr.patch
+Patch32: e-smith-base-5.2.0-relocate_dhcpd_leases_file.patch
+Patch33: e-smith-base-5.2.0-fix_empty_file_test.patch
+Patch34: e-smith-base-5.2.0-cpu-conf.patch
+Patch35: e-smith-base-5.2.0-ldap-auth.patch
+Patch36: e-smith-base-5.2.0-enable-cpu.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
@@ -66,6 +73,7 @@ Requires: mdadm
 Requires: pv
 Requires: pam_abl
 Requires: nss_ldap
+Requires: cpu >= 1.4.3
 Obsoletes: rlinetd, e-smith-mod_ssl
 Obsoletes: e-smith-serial-console
 Obsoletes: sshell
@@ -85,6 +93,27 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-40.sme
+- Switch to cpu commands if ldap is master [SME: 6328]
+
+* Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-40.sme
+- Add templates for ldap authentication if enabled [SME: 6329]
+
+* Mon Nov 1 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-39.sme
+- Add cpu.conf and cpu-system.conf template/program to SME [SME: 6327]
+
+* Thu Oct 14 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-38.sme
+- Fix empty leases file test [SME: 6274]
+
+* Tue Oct 12 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-37.sme
+- Relocate dhcpd leases file [SME: 6274]
+
+* Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-36.sme
+- Add migrate script to add missing HWaddr to interface records [SME: 6267]
+
+* Mon Oct 11 2010 Shad L. Lords <slords@mail.com> 5.2.0-35.sme
+- Make lcp options configurable [SME: 6277]
+
 * Mon Oct 11 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-34.sme
 - Relocate dhclient conf file [SME: 5833]
 
@@ -1436,6 +1465,13 @@ e-smith server and gateway software - ba
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
+%patch35 -p1
+%patch36 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]