--- rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec	2021/06/01 15:47:06	1.1
+++ rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec	2021/10/05 18:26:01	1.12
@@ -1,12 +1,12 @@
-# $Id: smeserver-phpldapadmin.spec,v 1.1 2015/08/22 20:13:33 stephdl Exp $
+# $Id: smeserver-phpldapadmin.spec,v 1.11 2021/10/04 13:49:59 brianr Exp $
 # Authority: nocvs
 # Name: Michel Van hees
 
 Summary: PhpLdapAdmin for SME server
 %define name smeserver-phpldapadmin
 Name: %{name}
-%define version 1.5.0
-%define release 2
+%define version 1.6.0
+%define release 4
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
@@ -16,11 +16,30 @@ Source: %{name}-%{version}.tar.gz
 BuildRoot: /var/tmp/e-smith-buildroot
 BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
-Requires: smeserver-release >= 9
-Requires: phpldapadmin >= 1.2.3
+Requires: smeserver-release >= 10
+Requires: phpldapadmin >= 1.2.6
+Patch0:smeserver-phpldapadmin-1.6.0-Add-in-update-event-and-php-fpm-stuff.patch
+Patch1:smeserver-phpldapadmin-1.6.0-password-hash-renamed-in-config.patch
+Patch2:smeserver-phpldapadmin-1.6.0-Alter-config-auth-type.patch
 AutoReqProv: no
 
 %changelog
+* Tue Oct 05 2021 Brian Read <brianr@bjsystems.co.uk> 1.6.0-4.sme
+- Alter auth-type config parameter to cookie from http [SME: 11699]
+
+* Mon Oct 04 2021 Brian Read <brianr@bjsystems.co.uk> 1.6.0-3.sme
+- Update config to change password_hash to pla_ [SME: 11699 ]
+
+* Mon Oct 04 2021 BogusDateBot
+- Eliminated rpmbuild "bogus date" warnings due to inconsistent weekday,
+  by assuming the date is correct and changing the weekday.
+
+* Mon Oct 04 2021 Brian Read <brianr@bjsystems.co.uk> 1.6.0-2.sme
+- change php to fpm and add -update event to createlinks [SME: 11699]
+
+* Tue Sep 28 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 1.6.0-1.sme
+- Initial release to contribs10 [SME: 11699]
+
 * Sat Aug 22 2015 stephane de Labrusse <stephdl@de-labrusse.fr> 1.5.0-2.sme
 - Initial release to contribs9
 
@@ -47,10 +66,13 @@ AutoReqProv: no
 - Use of phpldapadmin 0.9.8.3
 
 %description
-SME server - phpmyadmin multiuser for smeserver
+SME server - phpldapadmin for smeserver
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks