--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/04/01 16:58:34	1.43
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/07/04 21:59:38	1.52
@@ -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 5
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,11 +12,17 @@ Patch1: e-smith-base-4.18.1-fixgettext.p
 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
+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
 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)
@@ -59,6 +65,35 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Fri Jul 4 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]
+
+* 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]
 
@@ -1208,6 +1243,12 @@ e-smith server and gateway software - ba
 %patch3 -p1
 %endif
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]