--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/04/03 02:22:30	1.46
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/08/17 15:05:23	1.61
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.1
-%define release 9
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -14,11 +14,23 @@ Patch3: e-smith-base-4.18.1-insertmode.p
 Patch4: e-smith-base-4.18.1-freebusy.patch
 Patch5: e-smith-base-4.18.1-frames.patch
 Patch6: e-smith-base-4.18.1-quitconsole.patch
+Patch7: e-smith-base-4.18.1-freebusy.patch2
+Patch8: e-smith-base-4.18.1-dateManip.patch
+Patch9: e-smith-base-4.18.1-ethernetlist.patch
+Patch10: e-smith-base-4.18.1-add2general.patch
+Patch11: e-smith-base-4.18.1-get_raid_details_cciss.patch
+Patch12: e-smith-base-4.18.1-RevertInvalidLocaleReversion.patch
+Patch13: e-smith-base-4.18.1-FixAndMoveRESET_PASSWORD_TITLE.patch
+Patch14: e-smith-base-4.18.1-removeInvalidEntryTag.patch
+Patch15: e-smith-base-4.18.1-fixPASSWORD_VERIFY_ERROR.patch
+Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch
+Patch17: e-smith-base-4.18.1-ip-down.race.patch
+Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
 Requires: server-manager-images, server-manager
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Requires: initscripts >= 6.67-1es17
 Requires: e-smith-daemontools >= 1.7.1-04
 Requires: perl(Locale::gettext)
@@ -32,7 +44,6 @@ Requires: /sbin/microcode_ctl
 Requires: dbus
 Requires: hal
 Requires: acpid
-Requires: whiptail
 Requires: rssh
 Requires: bridge-utils
 Requires: vconfig
@@ -61,6 +72,51 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
+- Add gettext to creating backup file title for localization. [SME: 4467]
+
+* Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
+- Fix race condition in VPN ip-down handling which could cause loss of
+  LAN connectivity. [SME: 4405]
+
+* Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
+- Remove requires for whiptail.  No longer needed [SME: 4491]
+
+* Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
+- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
+
+* Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
+- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it 
+  to e-smith-formmagick's general [SME: 4475]
+- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
+- Remove invalid entry tag from userpassword's locale file preventing the 
+  form from displaying properly [SME: 4479]
+
+* Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
+- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
+
+* Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
+- Revert some locale changes
+
+* Tue Jul 22 2008 Gavin Weight <gweight@gmail.com> 4.18.1-15
+- Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-13
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
+* Wed Apr 23 2008 Shad L. Lords <slords@mail.com> 4.18.1-12
+- Fix for > 5 nics detected [SME: 4232]
+
+* Tue Apr 22 2008 Shad L. Lords <slords@mail.com> 4.18.1-11
+- Remove use of Date::Manip from ssl.crt [SME: 3155]
+
+* Sat Apr 19 2008 Shad L. Lords <slords@mail.com> 4.18.1-10
+- Fix FreeBusy param when disabled [SME: 1806]
+- Remove .orig file [SME: 4228]
+
 * Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-9
 - Remove quitConsole from menu [SME: 4154]
 
@@ -1225,6 +1281,18 @@ e-smith server and gateway software - ba
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]