--- rpms/smeserver-userpanel/contribs9/smeserver-userpanel.spec	2015/10/17 18:24:32	1.3
+++ rpms/smeserver-userpanel/contribs9/smeserver-userpanel.spec	2017/05/31 20:48:55	1.14
@@ -1,12 +1,12 @@
-# $Id: smeserver-userpanel.spec,v 1.2 2015/08/22 20:34:24 stephdl Exp $
+# $Id: smeserver-userpanel.spec,v 1.13 2017/05/31 19:29:59 unnilennium Exp $
 # Authority: dungog
 # Name: Stephen Noble
 
 Summary: Provide a user panel to let users to change delegated server settings.
 %define name smeserver-userpanel
 Name: %{name}
-%define version 1.1
-%define release 4
+%define version 1.2
+%define release 3
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -19,7 +19,10 @@ Requires: e-smith-release >= 9
 BuildRequires: e-smith-devtools
 Obsoletes: e-smith-userpanel
 AutoReqProv: no
-Patch0: smeserver-userpanel-1.1.bz9093.user_alias.patch
+#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
@@ -29,7 +32,19 @@ userpanels available in seperate rpms.
 Panels can be delegated at user, group or global levels
 
 %changelog
-* Thu Oct 15 2015 Michel Begue <mab974@gmail.com> 1.1-4.sme
+* Wed May 31 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.2-3.sme
+- rebuild archive to fix [SME: 8026]
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+
+* Tue May 30 2017 Jean-Philipe Pialasse <tests@pialasse.com> 1.1-8.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.
+
+* Thu Oct 15 2015 Michel Begue <mab974@gmail.com> 1.1-5.sme
 - Add an alias in db key for userpanel [SME:9093]
 
 * Sat Aug 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.1-3.sme
@@ -164,7 +179,8 @@ Panels can be delegated at user, group o
 - many other changes
 - [1.6.0-1]
 
-* Thu May 21 2003 Stephen Noble <support@dungog.net>
+* Wed May 21 2003 Stephen Noble <support@dungog.net>
+  Thu May 21 2003 --> Thu May 15 2003 or Wed May 21 2003 or Thu May 22 2003 or ....
 - Fix 90e-smithAccess30user, httpd failed with 500?+ users
 - [1.0-11]
 
@@ -331,13 +347,15 @@ Panels can be delegated at user, group o
 - [0.1-2]
 - added post (un)install scripts to expand/reload the relevant templates/services
 
-* Mon Sep 04 2001 Daniel van Raay <danielvr@caa.org.au>
+* Tue Sep 04 2001 Daniel van Raay <danielvr@caa.org.au>
 - [0.1-1]
 - initial release
 
 %prep
 %setup
-%patch0 -p1
+#%patch0 -p1
+#%patch1 -p1
+#%patch2 -p1
 
 %build
 perl createlinks
@@ -361,6 +379,8 @@ echo '%attr(0755,root,admin) /etc/e-smit
 %preun
 
 %post
+# dirty workaround to fix the index and multiple login windows
+/bin/touch /etc/e-smith/web/panels/user/html/index.html
 
 #/sbin/e-smith/expand-template /etc/httpd/admin-conf/httpd.conf
 #/sbin/e-smith/expand-template /etc/httpd/conf/httpd.conf