--- rpms/smeserver-userpanel/contribs9/smeserver-userpanel.spec	2016/07/19 13:23:55	1.5
+++ rpms/smeserver-userpanel/contribs9/smeserver-userpanel.spec	2017/05/30 17:51:49	1.7
@@ -1,4 +1,4 @@
-# $Id: smeserver-userpanel.spec,v 1.4 2015/10/18 19:45:24 stephdl Exp $
+# $Id: smeserver-userpanel.spec,v 1.6 2016/07/19 13:24:34 unnilennium Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
@@ -6,14 +6,13 @@ Summary: Provide a user panel to let use
 %define name smeserver-userpanel
 Name: %{name}
 %define version 1.1
-%define release 6
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 URL: http://wiki.contribs.org
 Group: SMEserver/addon
 Source: %{name}-%{version}.tar.gz
-Patch0:smeserver-userpanel-1.1.bz9678.Koozali_manager.patch
 BuildArchitectures: noarch
 BuildRoot: /var/tmp/%{name}-%{version}
 Requires: e-smith-release >= 9
@@ -21,6 +20,9 @@ BuildRequires: e-smith-devtools
 Obsoletes: e-smith-userpanel
 AutoReqProv: no
 Patch0: smeserver-userpanel-1.1.bz9093.user_alias.patch
+Patch1:smeserver-userpanel-1.1.bz9678.Koozali_manager.patch
+Patch2: smeserver-userpanel-1.1.bz8026.redirectionOnLogout.patch
+
 %description
 SME Server enhancement to create a user manager panel where users can
 authenticate with their own username/password and change selected
@@ -30,6 +32,9 @@ userpanels available in seperate rpms.
 Panels can be delegated at user, group or global levels
 
 %changelog
+* Tue May 30 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-7.sme
+- fix bad redirection on logout or timeout [SME: 8026]
+
 * Tue Jul 19 2016 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-6.sme
 - adapt to the new color of manager for Koozali [SME: 9678]
 - thanks to John Crisp for this great work.
@@ -344,6 +349,7 @@ Panels can be delegated at user, group o
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks