--- 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/04/03 02:22:30	1.46
@@ -2,13 +2,18 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.1
-%define release 2
+%define release 9
 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
+Patch3: e-smith-base-4.18.1-insertmode.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -56,6 +61,28 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-9
+- Remove quitConsole from menu [SME: 4154]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-8
+- Really fix free/busy in usermanager [SME: 4157]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-7
+- Use frames in elinks [SME: 4156]
+- Set homepage for elinks [SME: 4160]
+
+* Wed Apr 2 2008 Shad L. Lords <slords@mail.com> 4.18.1-6
+- Fix free/busy field in useraccounts [SME: 4157]
+
+* Tue Apr 1 2008 Shad L. Lords <slords@mail.com> 4.18.1-5
+- Add free/busy URL entry to help kronolith contribs [SME: 1806]
+
+* Fri Mar 28 2008 Shad L. Lords <slords@mail.com> 4.18.1-4
+- Fix insert_mode for elinks on el5 platform [SME: 4127]
+
+* 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 +1218,13 @@ e-smith server and gateway software - ba
 %prep
 %setup
 %patch1 -p1
+%patch2 -p1
+%if "%{?rhel}" == "5"
+%patch3 -p1
+%endif
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]