--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/01/31 21:54:06	1.14
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2016/07/19 13:47:57	1.23
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.13 2016/01/06 15:05:33 vip-ire Exp $
+# $Id: e-smith-manager.spec,v 1.22 2016/07/19 13:14:59 unnilennium Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.6.0
-%define release 3
+%define release 12
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -12,6 +12,9 @@ Group: Networking/Daemons
 Source: %{name}-%{version}.tar.xz
 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
+Patch2: e-smith-manager-2.4.0-newTKTsyntax.patch
+Patch3: e-smith-manager-2.6.0-no_index_for_manager_common.patch
+Patch4: e-smith-manager-2.6.0-Koozali_manager.patch
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -25,6 +28,30 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-12.sme
+- Update server-manager to Koozali branding [SME: 9678]
+- We thanks John Crisp for his wonderful work.
+- e-smith-manager-2.6.0-Koozali_manager.patch
+
+* Wed Jun 15 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-9.sme
+- Better syntax for removing Indexes option for the manager [SME: 9589]
+
+* Wed Jun 15 2016 Daniel Berteaud <daniel@firewall-services.com> 2.6.0-8.sme
+- Remove index option for manager's resources [SME: 9589]
+
+* Sun Jun 12 2016 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-7.sme
+- fix 307 redirection to http when https is used [SME: 8825]
+- update syntaxe for TKT Auth
+- bump 7 for typo
+
+* 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]
@@ -669,6 +696,9 @@ This RPM contributes the navigation bars
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 perl createlinks