--- rpms/e-smith-base/sme8/e-smith-base.spec	2010/09/23 14:59:41	1.99
+++ 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.98 2010/08/08 08:08:32 wellsi 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 29
+%define release 41
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -34,6 +34,18 @@ Patch21: e-smith-base-5.2.0-condrestart.
 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
+Patch25: e-smith-base-5.2.0-ibay_groups.patch
+Patch26: e-smith-base-5.2.0-keep_external.patch
+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
@@ -61,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
@@ -80,6 +93,42 @@ 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]
+
+* Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-33.sme
+- Disable apmd on 64-bit arch [SME: 6170]
+
+* Fri Oct 8 2010 Shad L. Lords <slords@mail.com> 5.2.0-32.sme
+- Remove check for maxUsers [SME: 5537]
+
+* Wed Oct 6 2010 Shad L. Lords <slords@mail.com> 5.2.0-31.sme
+- Try and keep same external address for pppoe connections [SME: 6263]
+
+* Mon Sep 27 2010 Shad L. Lords <slords@mail.com> 5.2.0-30.sme
+- Add ibay groups to group membership [SME: 6247]
+
 * Thu Sep 23 2010 Daniel Berteaud <daniel@firewall-services.com> 5.2.0-29.sme
 - Prepare nss_ldap [SME: 6227]
 
@@ -1411,6 +1460,18 @@ e-smith server and gateway software - ba
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%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 ]