--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/08/07 19:03:45	1.57
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/20 14:40:04	1.61.2.4
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.1
-%define release 18
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -23,6 +23,11 @@ Patch12: e-smith-base-4.18.1-RevertInval
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -41,7 +46,6 @@ Requires: /sbin/microcode_ctl
 Requires: dbus
 Requires: hal
 Requires: acpid
-Requires: whiptail
 Requires: rssh
 Requires: bridge-utils
 Requires: vconfig
@@ -70,6 +74,31 @@ 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
+- Correct gettext type during build process [SME: 570]
+
+* Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.18.1-25
+- Fix screen corruption in console [SME: 4155]
+
+* Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.18.1-24
+- Fix detection of xen instance against newer kernels [SME: 4555]
+
+* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.18.1-23
+- Fixed warnings generated during build process [SME: 570]
+
+* 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]
@@ -1275,6 +1304,11 @@ e-smith server and gateway software - ba
 %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 ]
@@ -1339,7 +1373,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
@@ -1384,7 +1418,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
@@ -1396,8 +1429,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