--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/23 08:12:34	1.67
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2009/10/24 20:35:32	1.77
@@ -1,19 +1,25 @@
+# $Id: e-smith-base.spec,v 1.76 2009/10/20 13:59:20 filippocarletti Exp $
+
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 4.19.0
-%define release 6
+%define version 5.2.0
+%define release 8
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-base-4.19.0-xenfix.patch
-Patch2: e-smith-base-4.19.0-profile.patch
-Patch2: e-smith-base-4.19.0-localeemail.patch
+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
 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
@@ -40,9 +46,7 @@ Obsoletes: rlinetd, e-smith-mod_ssl
 Obsoletes: e-smith-serial-console
 Obsoletes: sshell
 Obsoletes: e-smith-rp-pppoe
-%if "%{?rhel}" == "5"
 Obsoletes: perl-Data-UUID
-%endif
 BuildRequires: perl, perl(Test::Inline) >= 0.12
 BuildRequires: e-smith-devtools >= 1.13.1-03
 BuildRequires: gettext
@@ -57,6 +61,30 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
 * Tue Sep 23 2008 Stephen Noble <support@dungog.net> 4.19.0-6
 - Add locale tags for email in review panel [SME: 4267]
 
@@ -1279,6 +1307,10 @@ e-smith server and gateway software - ba
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]