--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/07/23 18:11:57	1.54
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/08/07 19:03:45	1.57
@@ -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 15
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,10 @@ Patch8: e-smith-base-4.18.1-dateManip.pa
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -66,6 +70,19 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
 
@@ -1254,6 +1271,10 @@ e-smith server and gateway software - ba
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]