--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/06 20:20:05	1.18
+++ rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/22 16:47:56	1.27
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.17 2013/02/28 22:49:10 slords Exp $
+# $Id: e-smith-base.spec,v 1.26 2013/03/17 05:15:13 wellsi Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.4.0
-%define release 16
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -22,6 +22,19 @@ Patch8: e-smith-base-5.4.0-PostUpgradeRe
 Patch9: e-smith-base-5.4.0-inittab.patch
 Patch10: e-smith-base-5.4.0-pwauth.patch
 Patch11: e-smith-base-5.4.0-uidgid.patch
+Patch12: e-smith-base-5.4.0-fixwww.patch
+Patch13: e-smith-base-5.4.0-SystemName.patch
+Patch14: e-smith-base-5.4.0-existing_hwaddr.patch
+Patch15: e-smith-base-5.4.0-remove_syslogd_templates.patch
+Patch16: e-smith-base-5.4.0-rsyslog_templates.patch
+Patch17: e-smith-base-5.4.0-rsyslog_db.patch
+Patch18: e-smith-base-5.4.0-rsyslog.conf.patch
+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
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Requires: pwauth
@@ -69,6 +82,36 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* 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]
+
+* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-22.sme
+- Remove modprobe stuff [SME: 7261]
+
+* Sat Mar 16 2013 Shad L. Lords <slords@mail.com> 5.4.0-21.sme
+- Don't be as agressive on rate limiting [SME: 7470]
+
+* Sat Mar 16 2013 Daniel Berteaud <daniel@firewall-services.com> 5.4.0-20.sme
+- Change syslog templates to rsyslog [SME: 7221]
+
+* Fri Mar 15 2013 Ian Wells <esmith@wellsi.com> 5.4.0-19.sme
+- Ensure existing_hwaddr is always initialized [SME: 7471]
+
+* Thu Mar 14 2013 Ian Wells <esmith@wellsi.com> 5.4.0-18.sme
+- Change System Name from mitel-networks-server to sme-server [SME: 7485]
+
+* Sat Mar 9 2013 Shad L. Lords <slords@mail.com> 5.4.0-17.sme
+- Fix user www creation in init-accounts [SME: 7319]
+
 * Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 5.4.0-16.sme
 - Update package and path for pwauth [SME: 7319]
 - Update init-accounts to set uid/gid correctly for pwauth
@@ -1557,6 +1600,23 @@ e-smith server and gateway software - ba
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -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 \