--- rpms/e-smith-base/sme8/e-smith-base.spec	2007/06/12 18:30:36	1.1
+++ rpms/e-smith-base/sme8/e-smith-base.spec	2007/07/01 17:08:01	1.5
@@ -2,7 +2,7 @@ Summary: e-smith server and gateway - ba
 %define name e-smith-base
 Name: %{name}
 %define version 4.18.0
-%define release 58
+%define release 62
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -54,6 +54,10 @@ Patch43: e-smith-base-4.18.0-raidfix.pat
 Patch44: e-smith-base-4.18.0-bootstrap.patch
 Patch45: e-smith-base-4.18.0-pamtemplate.patch3
 Patch46: e-smith-base-4.18.0-restoredev.patch
+Patch47: e-smith-base-4.18.0-no_kmodule.patch
+Patch48: e-smith-base-4-18-0-MovePam_d_ftpTemplates.patch
+Patch49: e-smith-base-4.18.0-usbback_errcheck.patch
+Patch50: e-smith-base-4.18.0-devicechk.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 1.18.0-7
@@ -101,6 +105,20 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Sun Jul 1 2007 Shad L. Lords <slords@mail.com> 4.18.0-62
+- Clean up loop var and mount point for backup/restore [SME: 3116]
+
+* Thu Jun 28 2007 Shad L. Lords <slords@mail.com> 4.18.0-61
+- Improve usb backup error reporting [SME: 2772]
+
+* Tue Jun 26 2007 Gavin Weight <gweight@gmail.com> 4.18.0-60
+- Move the pam.d ftp/proftpd templates to e-smith-proftpd.
+  [SME: 2762]
+
+* Tue Jun 19 2007 Charlie Brady <charlie_brady@mitel.com> 4.18.0-59
+- Have nonetworkdrivers script exit silently if kmodule bin not found.
+  [SME: 2549]
+
 * Mon Jun 11 2007 Shad L. Lords <slords@mail.com> 4.18.0-58
 - Start messagebus/haldaemon so restore works [SME: 3058]
 
@@ -1134,6 +1152,10 @@ e-smith server and gateway software - ba
 %patch44 -p1
 %patch45 -p1
 %patch46 -p1
+%patch47 -p1
+%patch48 -p1
+%patch49 -p1
+%patch50 -p1
 
 rm -rf root/etc/e-smith/db/configuration/defaults/httpd-admin
 rm -rf root/etc/e-smith/templates/etc/identd.masq
@@ -1215,7 +1237,7 @@ mkdir -p root/etc/e-smith/templates/etc/
 ln -s /etc/e-smith/templates-default/template-begin-shell \
       root/etc/e-smith/templates/etc/dhcpc/dhcpcd.exe/template-begin
 
-for file in ftp imap login passwd proftpd pwauth system-auth
+for file in imap login passwd pwauth system-auth
 do
     mkdir -p root/etc/e-smith/templates/etc/pam.d/$file
     ln -s /etc/e-smith/templates-default/template-begin-pam \