--- rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/08/08 11:07:56	1.20
+++ rpms/e-smith-base+ldap/sme7/e-smith-base+ldap.spec	2008/09/15 15:16:57	1.25
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base+ldap
 Name: %{name}
 %define version 4.19.1
-%define release 22
+%define release 28
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -29,6 +29,10 @@ Patch18: e-smith-base+ldap-4.19.1-merge_
 Patch19: e-smith-base+ldap-4.19.1-2739schema.patch
 Patch20: e-smith-base-4.18.1-PortFixesFromBase.patch
 Patch21: e-smith-base-4.18.1-fixPASSWORD_VERIFY_NEW.patch
+Patch22: e-smith-base-4.18.1-ip-down.race.patch
+Patch23: e-smith-base-4.18.1-FixLocalizedTitle.patch
+Patch24: e-smith-base-4.18.1-xenfix.patch
+Patch25: 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
@@ -47,7 +51,6 @@ Requires: /sbin/microcode_ctl
 Requires: dbus
 Requires: hal
 Requires: acpid
-Requires: whiptail
 Requires: rssh
 Requires: bridge-utils
 Requires: vconfig
@@ -85,6 +88,25 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Mon Sep 15 2008 Shad L. Lords <slords@mail.com> 4.19.1-28
+- Fix screen corruption in console [SME: 4155]
+
+* Sat Sep 13 2008 Shad L. Lords <slords@mail.com> 4.19.1-27
+- Fix detection of xen instance against newer kernels [SME: 4555]
+
+* Thu Aug 28 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-26
+- Fixed warnings generated during build process [SME: 570]
+
+* Sun Aug 17 2008 Gavin Weight <gweight@gmail.com> 4.19.1-25
+- Add gettext to creating backup file title for localization. [SME: 4467]
+
+* Tue Aug 12 2008 Gavin Weight <gweight@gmail.com> 4.19.1-24
+- 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.19.1-23
+- Remove requires for whiptail.  No longer needed [SME: 4491]
+
 * Fri Aug  8 2008 Jonathan Martens <smeserver-contribs@snetram.nl> 4.19.1-22
 - Change userpassword panel to use PASSWORD_VERIFY_NEW instead of PASSWORD_NEW_VERIFY [SME: 4487]
 
@@ -1199,6 +1221,10 @@ e-smith server and gateway software - ba
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]
@@ -1263,7 +1289,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 shell -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
@@ -1308,7 +1334,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
@@ -1320,8 +1345,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