--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/16 16:15:40	1.24
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/06/06 15:35:46	1.37
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.23 2013/03/16 15:30:02 slords Exp $
+# $Id: e-smith-base.spec,v 1.36 2013/05/20 15:06:51 wellsi Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 23
+%define release 35
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -32,6 +32,15 @@ Patch18: e-smith-base-5.4.0-rsyslog.conf
 Patch19: e-smith-base-5.4.0-rate_limit.patch
 Patch20: e-smith-base-5.4.0-no_modprobe.patch
 Patch21: e-smith-base-5.4.0-more_rsyslog.patch
+Patch22: e-smith-base-5.4.0-ConsoleBackupText.patch
+Patch23: e-smith-base-5.4.0-NICBonding.patch
+Patch24: e-smith-base-5.4.0-rename_pam_ldap_conf.patch
+Patch25: e-smith-base-5.4.0-fix_bash-in_run_pppoe_conf.patch 
+Patch26: e-smith-base-5.4.0-StartService.patch
+Patch27: e-smith-base-5.4.0-rcesmith-removal.patch
+Patch28: e-smith-base-5.4.0-add_template_to_ssl.pem.patch
+Patch29: e-smith-base-5.4.0-init-accounts.patch
+Patch30: e-smith-base-5.4.0-do_not_remove_utf8.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: pwauth
@@ -59,6 +68,7 @@ Requires: e-smith-bootloader
 Requires: mdadm
 Requires: pv
 Requires: pam_abl
+Requires: diald
 Requires: /usr/bin/passwd
 Requires: nss-pam-ldapd
 Obsoletes: nss_ldap < 254
@@ -79,6 +89,42 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-35.sme
+- Use UTF-8 in the console [SME: 7591]
+
+* Sun May 19 2013 Ian Wells <esmith@wellsi.com> 5.4.0-34.sme
+- Remove redundant parts of init-accounts [SME: 3550]
+
+* Sat May 18 2013 chris burnat <devlist@burnat.com> 5.4.0-33.sme
+- Add_template_to_ssl.pem, codes by JP Pialasse [SME: 7601]
+
+* Tue May 07 2013 Ian Wells <esmith@wellsi.com> 5.4.0-32.sme
+- Require diald [SME: 7279]
+
+* Mon May 06 2013 Ian Wells <esmith@wellsi.com> 5.4.0-31.sme
+- Removal of rc.e-smith now functionality is in e-smith-service [SME: 7267]
+
+* Sun May 05 2013 Ian Wells <esmith@wellsi.com> 5.4.0-30.sme
+- Revert last change. [SME: 7227]
+
+* Sat May 04 2013 Ian Wells <esmith@wellsi.com> 5.4.0-29.sme
+- Suppress template text from /etc/inittab [SME: 7227]
+
+* Mon Apr 22 2013 Ian Wells <esmith@wellsi.com> 5.4.0-28.sme
+- Replacement of rc.e-smith by moving code into e-smith-service [SME: 7267]
+
+* Mon Apr 21 2013 chris burnat <devlist@burnat.com> 5.4.0-27.sme
+- Fix the way '.' works in bash [SME: 7532]
+
+* Fri Mar 22 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-26.sme
+- rename /etc/ldap.conf to /etc/pam_ldap.conf (and same for .secret) [SME: 7289]
+
+* Sat Mar 16 2013 Ian Wells <esmith@wellsi.com> 5.4.0-25.sme
+- Always define InternalInterface NICBonding [SME: 7498]
+
+* Sat Mar 16 2013 Terry Fage <trex1512@yahoo.com.au> 5.4.0-24.sme
+- In the console refer to removable media instead of USB disk [SME: 7414]
+
 * Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-23.sme
 - Fix a few more syslog => rsyslog items [SME: 7221]
 
@@ -1598,10 +1644,21 @@ e-smith server and gateway software - ba
 %patch19 -p1
 %patch20 -p1
 %patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch26 -p1
+%patch27 -p1
+%patch28 -p1
+%patch29 -p1
+%patch30 -p1
+
+# We cannot remove an empy files or folders with a patch, see [SME: 7289]
+# We remove this because it contains an empty template-begin file
+rm -rf root/etc/e-smith/templates/etc/ldap.secret/
 
 %pre
-/sbin/e-smith/create-system-user smelog 1002 \
-    'smelog log user' /var/log/smelog /bin/false
 /sbin/e-smith/create-system-user smelastsys 2999 \
     'sme last system user marker' /tmp /bin/false