--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/04/28 23:21:29	1.51
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/08/05 17:44:29	1.56
@@ -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 13
+%define release 17
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -18,6 +18,8 @@ Patch7: e-smith-base-4.18.1-freebusy.pat
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -65,6 +67,18 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
 
@@ -1246,6 +1260,8 @@ e-smith server and gateway software - ba
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]