--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2013/06/06 16:20:57	1.9
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/03/04 14:24:36	1.16
@@ -1,18 +1,17 @@
-# $Id: e-smith-manager.spec,v 1.8 2013/03/06 20:20:26 slords Exp $
+# $Id: e-smith-manager.spec,v 1.15 2016/02/05 16:41:09 vip-ire Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
-%define version 2.4.0
-%define release 7
+%define version 2.6.0
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
-Patch1: e-smith-manager-2.4.0-Back.patch
-Patch2: e-smith-manager-2.4.0-pwauth.patch
-Patch3: e-smith-manager-2.4.0-remove_mod_ssl.patch
+Patch0: e-smith-manager-2.4.0-access_sm_from_console_over_plain.patch
+Patch1: e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -26,6 +25,31 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Fri Mar 4 2016 stephane de Labrusse <stephdl@de-labrusse.fr> 2.6.0-5.sme
+- corrected typo in e-smith-manager-2.4.0-dont_rewrite_to_https_from_localhost.patch
+- code from John H. Bennett III bennettj@johnbennettservices.com [SME: 9271]
+
+* Fri Feb 5 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-4.sme
+- Really don't redirect to http when login in/out of the server-manager
+  [SME: 9163]
+
+* Sun Jan 31 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-3.sme
+- Don't redirect to http when login in/out of the server-manager from
+  localhost [SME: 9163]
+
+* Wed Jan 6 2015 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-2.sme
+- Allow access to the server-manager without SSL from the loopback
+  [SME: 9163]
+
+* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.6.0-1.sme
+- Roll new stream to remove obsolete images [SME: 7962] 
+
+* Sun Mar 23 2014 Ian Wells <esmith@wellsi.com> 2.4.0-9.sme
+- Remove references to obsolete images, by Stephane de Labrusse [SME: 7962]
+
+* Fri Oct 11 2013 Ian Wells <esmith@wellsi.com> 2.4.0-8.sme
+- Renew donation text in server-manager, by John Crisp [SME: 7897]
+
 * Thu Jun 6 2013 Daniel Berteaud <daniel@firewall-services.com> 2.4.0-7.sme
 - Do not load mod_ssl [SME: 7602]
 
@@ -651,9 +675,8 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 perl createlinks