--- rpms/e-smith-base/sme8/e-smith-base.spec	2007/11/11 15:05:47	1.15
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/01/06 15:44:48	1.22
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.0
-%define release 76
+%define release 82
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -68,6 +68,11 @@ Patch57: e-smith-base-4.18.0-cert_regen.
 Patch58: e-smith-base-4.18.0-useracc_text_adjust.patch
 Patch59: e-smith-base-4.18.0-non_Removable_pseudonyms.patch
 Patch60: e-smith-base-4.18.0-delete_forwarder.patch
+Patch61: e-smith-base-4.18.0-part_size.patch
+Patch62: e-smith-base-4.18.0-passwdlock.patch
+Patch63: e-smith-base-4.18.0-smartd.patch
+Patch64: e-smith-base-4.18.0-smartdtemplates2expand.patch
+Patch65: e-smith-base-4.18.0-consoleValidatePassword.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-7
@@ -115,7 +120,25 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
-* Sun Nov 09 2007 Gavin Weight <gweight@gmail.com> 4.18.0-76
+* Sun Jan 06 2008 Stephen Noble <support@dungog.net> 4.18-82
+- Use esmith::util::validatePassword on console [SME: 2173]
+
+* Mon Dec 24 2007 Gavin Weight <gweight@gmail.com> 4.18.0-81
+- Link smartd.conf to bootstrap-save-console and console-save. [SME: 1445]
+
+* Mon Dec 24 2007 Stephen Noble <support@dungog.net> 4.18-80
+- Add smartd as a disabled service with template [SME: 1445]
+
+* Sun Dec 16 2007 Shad L. Lords <slords@mail.com> 4.18.0-79
+- Lock user accounts with usermod instead of passwd [SME: 3595]
+
+* Sun Dec 16 2007 Gavin Weight <gweight@gmail.com> 4.18.0-78
+- Add symlink to fr-fr locale. [SME: 3648]
+
+* Mon Nov 12 2007 Shad L. Lords <slords@mail.com> 4.18.0-77
+- Add fix for varying partition sizes in add_raid [SME: 3547]
+
+* Sun Nov 11 2007 Gavin Weight <gweight@gmail.com> 4.18.0-76
 - Fix removal of Corporate DNS from console.  [SME: 3532]
 
 * Fri Nov 02 2007 Gavin Weight <gweight@gmail.com> 4.18.0-75
@@ -1218,6 +1241,11 @@ e-smith server and gateway software - ba
 %patch58 -p1
 %patch59 -p1
 %patch60 -p1
+%patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+%patch65 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq
@@ -1289,7 +1317,8 @@ xgettext -o root/usr/share/locale/en_US/
 
 mkdir -p root/etc/e-smith/locale
 # Make the fr-ca link in %pre to ease upgrades
-# ln -s fr root/etc/e-smith/locale/fr-ca 
+# ln -s fr root/etc/e-smith/locale/fr-ca
+ln -s fr root/etc/e-smith/locale/fr-fr 
 ln -s en-us root/etc/e-smith/locale/en
 ln -s en-us root/etc/e-smith/locale/en-au
 ln -s en-us root/etc/e-smith/locale/en-gb