--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/03/26 17:01:52	1.40
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/03/26 21:01:12	1.41
@@ -2,13 +2,14 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.1
-%define release 2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
 Patch1: e-smith-base-4.18.1-fixgettext.patch
+Patch2: e-smith-base-4.18.1-deleteorder.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -56,6 +57,9 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-3
+- Set accounts to deleted before template expansion [SME: 4122]
+
 * Wed Mar 26 2008 Shad L. Lords <slords@mail.com> 4.18.1-2
 - Fix gettext strings returned by password checks [SME: 4104]
 
@@ -1191,6 +1195,7 @@ e-smith server and gateway software - ba
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]