--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/20 14:40:04	1.61.2.4
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/10/25 11:46:59	1.71
@@ -1,36 +1,20 @@
+# $Id: e-smith-base.spec,v 1.70 2008/10/13 21:47:35 slords Exp $
+
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 4.18.1
-%define release 26
+%define version 5.2.0
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-base-4.18.1-fixgettext.patch
-Patch2: e-smith-base-4.18.1-deleteorder.patch
-Patch3: e-smith-base-4.18.1-insertmode.patch
-Patch4: e-smith-base-4.18.1-freebusy.patch
-Patch5: e-smith-base-4.18.1-frames.patch
-Patch6: e-smith-base-4.18.1-quitconsole.patch
-Patch7: e-smith-base-4.18.1-freebusy.patch2
-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
-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
-Patch16: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch
-Patch17: e-smith-base-4.18.1-ip-down.race.patch
-Patch18: e-smith-base-4.18.1-FixLocalizedTitle.patch
-Patch19: e-smith-base-4.18.1-xenfix.patch
-Patch20: e-smith-base-4.18.1-profile.patch
+Patch1: e-smith-base-5.2.0-sambaRole.patch
+Patch2: e-smith-base-5.2.0-smartd40.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
@@ -57,9 +41,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
@@ -74,18 +56,33 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
-* Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.18.1-26
+* 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]
+
+* Sat Sep 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-5
 - Correct gettext type during build process [SME: 570]
 
-* Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.18.1-25
+* Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.0-4
 - Fix screen corruption in console [SME: 4155]
 
-* Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.18.1-24
+* Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
 - Fix detection of xen instance against newer kernels [SME: 4555]
 
-* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-23
+* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.0-2
 - Fixed warnings generated during build process [SME: 570]
 
+* Wed Aug 20 2008 Shad L. Lords <slords@mail.com> 4.19.0-1
+- Roll new dev stream.
+
 * Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.18.1-22
 - Add gettext to creating backup file title for localization. [SME: 4467]
 
@@ -1289,26 +1286,6 @@ e-smith server and gateway software - ba
 %setup
 %patch1 -p1
 %patch2 -p1
-%if "%{?rhel}" == "5"
-%patch3 -p1
-%endif
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%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 ]