--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2013/03/06 20:20:26	1.8
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/02/05 16:41:09	1.15
@@ -1,17 +1,17 @@
-# $Id: e-smith-manager.spec,v 1.7 2013/02/24 06:05:04 wellsi Exp $
+# $Id: e-smith-manager.spec,v 1.14 2016/01/31 21:54:06 vip-ire Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
-%define version 2.4.0
-%define release 6
+%define version 2.6.0
+%define release 4
 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
+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
@@ -25,6 +25,30 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* 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]
+
 * Wed Mar 6 2013 Shad L. Lords <slords@mail.com> 2.4.0-6.sme
 - Correct path to pwauth [SME: 7319]
 
@@ -647,8 +671,8 @@ This RPM contributes the navigation bars
 
 %prep
 %setup
+%patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 perl createlinks