--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/04/23 18:07:23	1.49
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/23 08:12:34	1.67
@@ -1,27 +1,21 @@
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 4.18.1
-%define release 12
+%define version 4.19.0
+%define release 6
 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
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
 Requires: server-manager-images, server-manager
-Requires: e-smith-formmagick >= 1.4.0-9
+Requires: e-smith-formmagick >= 1.4.0-12
 Requires: initscripts >= 6.67-1es17
 Requires: e-smith-daemontools >= 1.7.1-04
 Requires: perl(Locale::gettext)
@@ -35,7 +29,6 @@ Requires: /sbin/microcode_ctl
 Requires: dbus
 Requires: hal
 Requires: acpid
-Requires: whiptail
 Requires: rssh
 Requires: bridge-utils
 Requires: vconfig
@@ -64,6 +57,59 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* 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]
+
+* Mon Aug 11 2008 Charlie Brady <charlie_brady@mitel.com> 4.18.1-21
+- Fix race condition in VPN ip-down handling which could cause loss of
+  LAN connectivity. [SME: 4405]
+
+* Sat Aug 9 2008 Shad L. Lords <slords@mail.com> 4.18.1-20
+- Remove requires for whiptail.  No longer needed [SME: 4491]
+
+* Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-19
+- Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
+
+* Thu Aug  7 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-18
+- Revert locale key PASSWORD_RESET_TITLE to RESET_PASSWORD_TITLE and move it 
+  to e-smith-formmagick's general [SME: 4475]
+- Reverting all *PASSWORD_NO_MATCH to *PASSWORD_VERIFY_ERROR locale keys [SME: 4476]
+- Remove invalid entry tag from userpassword's locale file preventing the 
+  form from displaying properly [SME: 4479]
+
+* Tue Aug  5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-17
+- Revert previous invalid locale changes (reverting to 4.18.1-15) [SME: 4472]
+
+* Mon Aug  4 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-16
+- Revert some locale changes
+
+* Tue Jul 22 2008 Gavin Weight <gweight@gmail.com> 4.18.1-15
+- Add regex to support cciss device names in manageRAID.pl. [SME: 4455]
+
+* Sat Jul 5 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-14
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
+* Sun Apr 27 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-13
+- Add common <base> tags to e-smith-formmagick's general [SME: 4279]
+
 * Wed Apr 23 2008 Shad L. Lords <slords@mail.com> 4.18.1-12
 - Fix for > 5 nics detected [SME: 4232]
 
@@ -1232,15 +1278,7 @@ 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
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
@@ -1305,7 +1343,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 -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
@@ -1350,7 +1388,6 @@ rm root/service/{syslog,klogd}
 mkdir -p root/etc/e-smith/events/local
 mkdir -p root/etc/e-smith/events/user-modify-admin
 mkdir -p root/home/e-smith/db
-touch root/home/e-smith/db/configuration
 
 mkdir -p root/etc/e-smith/pam
 mkdir -p root/home/e-smith/ssl.key
@@ -1362,8 +1399,6 @@ mkdir -p root/var/state/e-smith
 for file in %{dbfiles}
 do
     mkdir -p root/etc/e-smith/db/$file/{defaults,migrate,force}
-    # Create ghost file for rpm
-    touch root/home/e-smith/db/$file
 done
 
 mkdir -p root/etc/tcprules