--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/10/07 17:52:47	1.69
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2010/02/08 20:51:48	1.85
@@ -1,18 +1,32 @@
-# $Id$
+# $Id: e-smith-base.spec,v 1.84 2010/02/05 08:24:41 dungog Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.2.0
-%define release 1
+%define release 15
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
+Patch1: e-smith-base-5.2.0-sambaRole.patch
+Patch2: e-smith-base-5.2.0-smartd40.patch
+Patch3: e-smith-base-5.2.0-usbRev70drive.patch
+Patch4: e-smith-base-5.2.0-FixLabelArray.patch
+Patch5: e-smith-base-5.2.0-straysymlink.patch
+Patch6: e-smith-base-5.2.0-nonetworkdrivers.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
-Requires: e-smith-lib >= 1.18.0-19
+Requires: e-smith-lib >= 2.2.0-2
 Requires: server-manager-images, server-manager
 Requires: e-smith-formmagick >= 1.4.0-12
 Requires: initscripts >= 6.67-1es17
@@ -54,6 +68,48 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* Fri Nov 6 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-9.sme
+- Translate $ifName in console configuration pages [SME: 5571]
+
+* Sat Oct 24 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-8.sme
+- Prevent IP conflicts between local and external interface in server gateway mode [SME: 5501]
+
+* Tue Oct 20 2009 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-7.sme
+- Clean up: remove unused nonetworkdrivers [SME: 5521]
+
+* Sat Jun 6 2009 Shad L. Lords <slords@mail.com> 5.2.0-6.sme
+- Clean up stray symlinks in /lib/modules before depmod [SME: 5336]
+
+* Mon May 18 2009 Gavin Weight <gweight@gmail.com> 5.2.0-5.sme
+- Allow for different mdadm output formats for DeviceSize. [SME: 5230]
+
+* Sat Feb 14 2009 Jonathan Martens <smeserver-contribs@snetram.nl> 5.2.0-4.sme
+- Auto-mount USB REV70-drive as usbdisk [SME: 5006]
+
+* Sat Oct 25 2008 Stephen Noble <support@dungog.net> 5.2.0-3.sme
+- create service link for smartd [SME: 1445]
+
+* Mon Oct 13 2008 Shad L. Lords <slords@mail.com> 5.2.0-2.sme
+- Add patch to support multiple samba roles [SME: 4172]
+
 * Tue Oct 7 2008 Shad L. Lords <slords@mail.com> 5.2.0-1.sme
 - Roll new stream to separate sme7/sme8 trees [SME: 4633]
 
@@ -1276,6 +1332,20 @@ e-smith server and gateway software - ba
 
 %prep
 %setup
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]