--- rpms/e-smith-base/sme8/e-smith-base.spec	2010/08/08 08:08:32	1.98
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/10/08 17:01:43	1.103
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.97 2010/07/25 13:42:18 charliebrady Exp $
+# $Id: e-smith-base.spec,v 1.102 2010/10/08 16:35:10 slords Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 28
+%define release 33
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -33,6 +33,11 @@ Patch20: e-smith-base-5.2.0-freebusy-use
 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
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
@@ -59,6 +64,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
@@ -78,6 +84,21 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
 * Sun Aug 8 2010 Ian Wells <esmith@wellsi.com> 5.2.0-28.sme
 - Enable cpuspeed by default [SME: 6066]
 
@@ -1405,6 +1426,11 @@ e-smith server and gateway software - ba
 %patch21 -p1
 %patch22 -p1
 %patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
@@ -1484,6 +1510,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