--- rpms/e-smith-base/sme8/e-smith-base.spec	2009/11/23 18:47:55	1.79
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/06/08 19:43:47	1.93
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.78 2009/11/06 12:29:24 snetram Exp $
+# $Id: e-smith-base.spec,v 1.92 2010/06/06 07:34:55 snetram Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 10
+%define release 23
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,6 +19,17 @@ Patch6: e-smith-base-5.2.0-nonetworkdriv
 Patch7: e-smith-base-5.2.0-checkIPOverlap.patch
 Patch8: e-smith-base-5.2.0-adapter-translation-fixes.patch
 Patch9: e-smith-base-5.2.0-FixLocale_External.patch
+Patch10: e-smith-base-5.2.0-perform_restore-hal.patch
+Patch11: e-smith-base-5.2.0-generate-2048-bits-keys.patch
+Patch12: e-smith-base-5.2.0-perform_backup-hal.patch
+Patch13: e-smith-base-5.2.0-hwaddress.patch
+Patch14: e-smith-base-5.2.0-sha1.patch
+Patch15: e-smith-base-5.2.0-fix-template-expansion-error.patch
+Patch16: e-smith-base-5.2.0-gettext.patch
+Patch17: e-smith-base-5.2.0-remove-freebusy-references.patch
+Patch18: e-smith-base-5.2.0-checkMaxUsers.patch
+Patch19: e-smith-base-5.2.0-no-nic.patch
+Patch20: e-smith-base-5.2.0-fix-local-nic-string-in-console.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.2.0-2
@@ -34,6 +45,7 @@ Requires: perl(Net::IPv4Addr)
 Requires: /usr/sbin/irqbalance
 Requires: /usr/sbin/cpuspeed
 Requires: /sbin/microcode_ctl
+Requires: /usr/sbin/smartd
 Requires: dbus
 Requires: hal
 Requires: acpid
@@ -63,6 +75,45 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Tue Jun  8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-23.sme
+- Fix translation of local nic string in console [SME: 5571]
+
+* Sun Jun  6 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-22.sme
+- Handle no network interface scenario in console [SME: 6023]
+
+* Sat Jun 5 2010 Ian Wells <esmith@wellsi.com>  5.2.0-21.sme
+- Remove checkMaxUsers(). [SME: 5537] 
+
+* Mon May 10 2010 John H. Bennett III <bennettj@johnbennettservices.com> 5.2.0-20.sme
+- Patch that will remove all FreeBusy references from e-smith-base. [SME: 5941] 
+
+* Wed Mar  3 2010 Federico Simoncelli <federico.simoncelli@gmail.com> 5.2.0-19.sme
+- Restate smartd dependency. [SME: 5814]
+
+* Mon Mar 1 2010 Shad L. Lords <slords@mail.com> 5.2.0-18.sme
+- Fix gettext errors in WAN/LAN subnet error message [SME: 5501]
+
+* Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-17.sme
+- Really fix template expansion error [SME: 4528]
+
+* Sun Feb 14 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-16.sme
+- Fix template expansion error [SME: 4528]
+
+* Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-15.sme
+- Improve security by using SHA1 algorithm for certificate signing [SME: 5737]
+
+* Fri Feb 5 2010 Stephen Noble <support@dungog.net> 5.2.0-14.sme
+- Fix eth? swapping [SME: 4528]
+
+* Sun Jan 31 2010 Stephen Noble <support@dungog.net> 5.2.0-13.sme
+- Fix console backup from removable media [SME: 4809]
+
+* Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-12.sme
+- Bump certificate encryption from 1024 bits to 2048 bits [SME: 5735]
+
+* Thu Jan 14 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-11.sme
+- Fix console restore from removable media (Federico Simoncelli) [SME: 4809]
+
 * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.2.0-10.sme
 - Add a dummy call so xgettext can pull translated $ifName in console configuration pages. [SME: 5571]
 
@@ -1321,6 +1372,17 @@ e-smith server and gateway software - ba
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]