--- rpms/e-smith-manager/sme8/e-smith-manager.spec	2009/12/09 20:19:24	1.18
+++ rpms/e-smith-manager/sme8/e-smith-manager.spec	2013/10/11 15:11:13	1.23
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.17 2009/09/19 12:07:15 dungog Exp $
+# $Id: e-smith-manager.spec,v 1.22 2013/06/08 10:09:54 vip-ire Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.2.0
-%define release 5
+%define release 9
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -13,6 +13,11 @@ Source: %{name}-%{version}.tar.gz
 Patch0: e-smith-manager-2.2.0-bug5022.patch
 Patch1: e-smith-manager-2.2.0-unsavedchanges2.patch
 Patch2: e-smith-manager-2.2.0-bug5656.patch
+Patch3: e-smith-manager-2.2.0-display-admin-only-messages-only-for-server-manager.patch
+Patch4: e-smith-manager-2.2.0-remove_empty_p.patch
+Patch5: e-smith-manager-2.2.0-Back.patch
+Patch6: e-smith-manager-2.2.0-remove_mod_ssl.patch
+Patch7: e-smith-manager-2.2.0-login-donate.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -23,6 +28,21 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.2.0-9.sme
+- Add donation text to login page, by John Crisp [SME: 7879]
+
+* Sat Jun 8 2013 Daniel Berteaud <daniel@firewall-services.com> 2.2.0-8.sme
+- Do not load mod_ssl [SME: 7663]
+
+* Wed Feb 27 2013 Ian Wells <esmith@wellsi.com> 2.2.0-7.sme
+- Correct processing of server-manager URL [SME: 7037]
+
+* Sat Aug 7 2010 Ian Wells <esmith@wellsi.com> 2.2.0-6.sme
+- Remove empty <p> tag from /etc/e-smith/web/common/foot.tmpl, by Daniel [SME: 5905]
+
+* Sun Jan 31 2010 Jonathan Martens <smeserver-contribs@snetram.nl> 2.2.0-5.sme
+- Only display error messages intended for admin in server-manager [SME: 5700]
+
 * Wed Dec  9 2009 Charlie Brady <charlieb@budge.apana.org.au> 2.2.0-4.sme
 - Fix css validation errors. [SME: 5656]
 
@@ -624,6 +644,11 @@ This RPM contributes the navigation bars
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 perl createlinks