--- rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec	2021/10/04 13:49:59	1.11
+++ rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec	2022/07/27 05:50:09	1.17
@@ -1,4 +1,4 @@
-# $Id: smeserver-phpldapadmin.spec,v 1.10 2021/10/04 11:53:51 brianr Exp $
+# $Id: smeserver-phpldapadmin.spec,v 1.16 2022/07/24 03:46:57 jpp Exp $
 # Authority: nocvs
 # Name: Michel Van hees
 
@@ -6,7 +6,7 @@ Summary: PhpLdapAdmin for SME server
 %define name smeserver-phpldapadmin
 Name: %{name}
 %define version 1.6.0
-%define release 3
+%define release 7
 Version: %{version}
 Release: %{release}%{?dist}
 License: Freely distributable
@@ -18,11 +18,27 @@ BuildRequires: e-smith-devtools
 BuildArchitectures: noarch
 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
+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
+Patch3: smeserver-phpldapadmin-1.6.0-Remove-intial-req-to-login.patch
+Patch4: smeserver-phpldapadmin-1.6.0-bz12055-httpd24.patch
+Patch5:smeserver-phpldapadmin-1.6.0-bz12055-24syntax.patch 
 AutoReqProv: no
 
 %changelog
+* Wed Jul 27 2022 Zsolt Vasarhelyi <vasarhelyizsolt@hotmail.com> 1.6.0-6.sme
+- update to template httpd24 syntax [SME: 12055]
+
+* Sat Jul 23 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.6.0-6.sme
+- update access to httpd24 syntax [SME: 12055]
+
+* Wed Oct 06 2021 Brian Read <brianr@bjsystems.co.uk> 1.6.0-5.sme
+- Remove-intial-req-to-login.patch [SME: 11699]
+
+* 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 ]
 
@@ -57,7 +73,8 @@ AutoReqProv: no
 - clean spec file
 - added default db value (patch file)
 
-* Thu Jun  26 2007 Michel Van hees <michel@vanhees.cc>
+* Tue Jun 26 2007 Michel Van hees <michel@vanhees.cc>
+  Thu Jun 26 2007 --> Thu Jun 21 2007 or Tue Jun 26 2007 or Thu Jun 28 2007 or ....
 - Restart contrib from scratch
 - Use of phpldapadmin 0.9.8.3
 
@@ -68,6 +85,10 @@ SME server - phpldapadmin for smeserver
 %setup
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks