--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/02/10 12:17:47	1.27
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/03/08 12:25:30	1.30
@@ -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 90
+%define release 98
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -81,12 +81,19 @@ Patch70: e-smith-base-4.18.0-adminIsNotR
 Patch71: e-smith-base-4.18.0-noMTU.patch
 Patch72: e-smith-base-4.18.0-ROUTER_DESC.patch
 Patch73: e-smith-base-4.18.0-rmDuplicates.patch
+Patch74: e-smith-base-4.18.0-tags2general.patch
+Patch75: e-smith-base-4.18.0-useracc_single_char-fix.patch
+Patch76: e-smith-base-4.18.0-gettextErrors.patch
+Patch77: e-smith-base-4.18.0-rmPleasewait.patch
+Patch78: e-smith-base-4.18.0-gettextErrors.patch2
+Patch79: e-smith-base-4.18.0-rmDuplicates.patch2
+Patch80: e-smith-base-4.18.0-gettextStrings.patch2
 
 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 >= 0.2.0
+Requires: e-smith-formmagick >= 1.4.0-9
 Requires: initscripts >= 6.67-1es17
 Requires: e-smith-daemontools >= 1.7.1-04
 Requires: perl(Locale::gettext)
@@ -129,6 +136,31 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 4.18-98
+- revised gettext messages [SME: 631]
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 4.18-97
+- gettext messages [SME: 631]
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 4.18-96
+- remove duplicate system password has been changed [SME: 3974]
+
+* Sat Mar 07 2008 Stephen Noble <support@dungog.net> 4.18-95
+- EthernetAssign shouldn't be translated [SME: 3947]
+
+* Sun Feb 17 2008 Stephen Noble <support@dungog.net> 4.18-94
+- Remove pleasewait function [SME: 126]
+
+* Sun Feb 17 2008 Stephen Noble <support@dungog.net> 4.18-93
+- fix gettext formatting in three files [SME: 3938]
+
+* Wed Feb 13 2008 chris burnat <devlist@burnat.com> 4.18-92
+- Fix creation of usernames and pseudonyms with one character
+- [SME: 2451]
+
+* Wed Feb 13 2008 Stephen Noble <support@dungog.net> 4.18-91
+- Remove <base> tags now in general [SME: 3911]
+
 * Sun Feb 10 2008 Stephen Noble <support@dungog.net> 4.18-90
 - Remove duplicate <base> entries [SME: 3894]
 
@@ -1287,6 +1319,13 @@ e-smith server and gateway software - ba
 %patch71 -p1
 %patch72 -p1
 %patch73 -p1
+%patch74 -p1
+%patch75 -p1
+%patch76 -p1
+%patch77 -p1
+%patch78 -p1
+%patch79 -p1
+%patch80 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq