--- rpms/e-smith-base/sme7/e-smith-base.spec	2009/11/23 18:38:47	1.74
+++ rpms/e-smith-base/sme7/e-smith-base.spec	2010/07/20 00:13:23	1.81
@@ -1,10 +1,10 @@
-# $Id: e-smith-base.spec,v 1.73 2009/11/06 12:22:03 snetram Exp $
+# $Id: e-smith-base.spec,v 1.80 2010/06/09 17:46:14 slords Exp $
 
 Summary: e-smith server and gateway - base module
 %define name e-smith-base
 Name: %{name}
 %define version 5.0.0
-%define release 8
+%define release 14
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -17,6 +17,11 @@ Patch4: e-smith-base-5.0.0-FixLabelArray
 Patch5: e-smith-base-5.0.0-straysymlink.patch
 Patch6: e-smith-base-5.0.0-adapter-translation-fixes.patch
 Patch7: e-smith-base-5.0.0-FixLocale_External.patch
+Patch8: e-smith-base+ldap-5.0.0-generate-2048-bits-keys.patch
+Patch9: e-smith-base-5.0.0-sha1.patch
+Patch10: e-smith-base-5.0.0-badkmods.patch
+Patch11: e-smith-base-5.0.0-fix-local-nic-string-in-console.patch
+Patch12: e-smith-base-5.0.0-condrestart.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 Requires: mod_auth_external
 Requires: e-smith-lib >= 2.0.0-2
@@ -60,6 +65,25 @@ AutoReqProv: no
 e-smith server and gateway software - base module.
 
 %changelog
+* Mon Jul 19 2010 Charlie Brady <charlie_brady@mitel.com> 5.0.0-14.sme
+- Don't exit 99 from e-smith-service script when called with 'condrestart'
+  and service is disabled. [SME: 6104]
+
+* Wed Jun 09 2010 Shad L. Lords <slords@mail.com> 5.0.0-13.sme
+- Fix patch so it doesn't create orig file [SME: 6039]
+
+* Tue Jun 08 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-12.sme
+- Fix translation of local nic string in console [SME: 6039]
+
+* Wed Jun 02 2010 Shad L. Lords <slords@mail.com> 5.0.0-11.sme
+- Remove bad kmods when configuring modules [SME: 5995]
+
+* Mon Feb 8 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-10.sme
+- Improve security by using SHA1 algorithm for certificate signing [SME: 5736]
+
+* Sat Jan 30 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 5.0.0-9.sme
+- Bump certificate encryption from 1024 bits to 2048 bits [SME: 5734]
+
 * Mon Nov 23 2009 Gavin Weight <gweight@gmail.com> 5.0.0-8.sme
 - Add a dummy call so xgettext can pull translated $ifName in console configuration pages [SME: 1189]
 
@@ -1307,6 +1331,11 @@ e-smith server and gateway software - ba
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
 
 %pre
 if [ -d /etc/e-smith/locale/fr-ca -a ! -L /etc/e-smith/locale/fr-ca ]