--- rpms/e-smith-base/sme9/e-smith-base.spec	2013/03/17 01:32:06	1.25
+++ 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.24 2013/03/16 16:15:40 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 24
+%define release 26
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -33,6 +33,8 @@ Patch19: e-smith-base-5.4.0-rate_limit.p
 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
@@ -80,6 +82,12 @@ 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]
 
@@ -1603,6 +1611,12 @@ e-smith server and gateway software - ba
 %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 \