--- rpms/e-smith-manager/sme9/e-smith-manager.spec	2017/01/19 21:55:33	1.26
+++ rpms/e-smith-manager/sme9/e-smith-manager.spec	2017/04/17 03:10:45	1.34
@@ -1,10 +1,10 @@
-# $Id: e-smith-manager.spec,v 1.25 2017/01/17 00:09:21 unnilennium Exp $
+# $Id: e-smith-manager.spec,v 1.33 2017/04/17 01:27:49 unnilennium Exp $
 
 Summary: e-smith manager navigation module
 %define name e-smith-manager
 Name: %{name}
 %define version 2.6.0
-%define release 14
+%define release 22
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -16,6 +16,10 @@ Patch2: e-smith-manager-2.4.0-newTKTsynt
 Patch3: e-smith-manager-2.6.0-no_index_for_manager_common.patch
 Patch4: e-smith-manager-2.6.0-Koozali_manager.patch
 Patch5: e-smith-manager-2.6.0-bz9920.badredirection.patch
+Patch6: e-smith-manager-2.6.0-bz10186-timeout.patch
+Patch7: e-smith-manager-2.6.0-bz10187-emptyback.patch
+Patch8: e-smith-manager-2.6.0-bz10238-bugreport.patch
+
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildRequires: e-smith-devtools
 BuildRequires: gettext
@@ -29,6 +33,28 @@ Provides: server-manager
 AutoReqProv: no
 
 %changelog
+* Sun Apr 16 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-22.sme
+- add a panel to ease reporting bugs [SME: 10238]
+- Original work from Mats Schuh m.schuh@neckargeo.net
+
+* Mon Mar 27 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-18.sme
+- fix  typo in e-smith-manager-2.6.0-bz10187-emptyback.patch [SME: 10187]
+
+* Sun Mar 26 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-17.sme
+- avoid internal server error if empty back parameter [SME: 10187]
+- return user friendly message
+
+* Sat Mar 25 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-16.sme
+- fix too short timeout in server-manager [SME: 10186]
+- now 30 min as default instead of 5
+- possibility to change this and adapt the default 0.66 of timeout remaining to reset it
+- by default only a session cookie, can activate persistent cookie
+- sha256 as encryption.
+
+* Mon Jan 23 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-15.sme
+- reapply patch 4
+-  Update server-manager to Koozali branding [SME: 9678]
+
 * Thu Jan 19 2017 Jean-Philipe Pialasse <tests@pialasse.com> 2.6.0-14.sme
 - move fix to the right line to be effective [SME: 9920]
 
@@ -707,9 +733,11 @@ This RPM contributes the navigation bars
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-#%patch4 -p1
+%patch4 -p1
 %patch5 -p1
-
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 perl createlinks