--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/13 18:15:21	1.64
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/10/07 17:52:47	1.69
@@ -1,14 +1,15 @@
+# $Id$
+
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 4.19.0
-%define release 3
+%define version 5.2.0
+%define release 1
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.gz
-Patch1: e-smith-base-4.19.0-xenfix.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -38,9 +39,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
@@ -55,6 +54,18 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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.19.0-4
+- Fix screen corruption in console [SME: 4155]
+
 * Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.0-3
 - Fix detection of xen instance against newer kernels [SME: 4555]
 
@@ -1265,7 +1276,6 @@ e-smith server and gateway software - ba
 
 %prep
 %setup
-%patch1 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
@@ -1330,7 +1340,7 @@ ln -s /etc/rc.d/rc7.d root/etc/rc7.d
 mkdir -p root/etc/rc.d/rc1.d
 
 mkdir -p root/usr/share/locale/en_US/LC_MESSAGES
-xgettext -L shell -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console
+xgettext -L perl -o root/usr/share/locale/en_US/LC_MESSAGES/server-console.po root/sbin/e-smith/console
 
 mkdir -p root/etc/e-smith/locale
 # Make the fr-ca link in %pre to ease upgrades