--- rpms/e-smith-base/sme8/e-smith-base.spec	2008/09/15 15:09:57	1.61.2.3
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2008/08/20 21:22:12	1.62
@@ -1,33 +1,13 @@
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
-%define version 4.18.1
-%define release 25
+%define version 4.19.0
+%define release 1
 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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-19
@@ -74,14 +54,8 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
-* 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]
+* 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]
@@ -1284,28 +1258,6 @@ e-smith server and gateway software - ba
 
 %prep
 %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 ]
@@ -1370,7 +1322,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 -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
@@ -1415,6 +1367,7 @@ 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
@@ -1426,6 +1379,8 @@ 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