--- rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec 2022/07/24 03:44:42 1.14 +++ rpms/smeserver-phpldapadmin/contribs10/smeserver-phpldapadmin.spec 2022/08/01 03:16:06 1.19 @@ -1,4 +1,4 @@ -# $Id: smeserver-phpldapadmin.spec,v 1.13 2021/10/06 14:33:00 brianr Exp $ +# $Id: smeserver-phpldapadmin.spec,v 1.18 2022/08/01 03:11:47 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 6 +%define release 9 Version: %{version} Release: %{release}%{?dist} License: Freely distributable @@ -17,15 +17,24 @@ BuildRoot: /var/tmp/e-smith-buildroot BuildRequires: e-smith-devtools BuildArchitectures: noarch Requires: smeserver-release >= 10 +Requires: e-smith-apache >= 2.6.0-19 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 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 +* Sun Jul 31 2022 Jean-Philippe Pialasse 1.6.0-9.sme +- update to template httpd24 syntax [SME: 12055] + add Requires: e-smith-apache >= 2.6.0-19 + +* Wed Jul 27 2022 Zsolt Vasarhelyi 1.6.0-7.sme +- update to template httpd24 syntax [SME: 12055] + * Sat Jul 23 2022 Jean-Philippe Pialasse 1.6.0-6.sme - update access to httpd24 syntax [SME: 12055] @@ -69,7 +78,8 @@ AutoReqProv: no - clean spec file - added default db value (patch file) -* Thu Jun 26 2007 Michel Van hees +* Tue Jun 26 2007 Michel Van hees + 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 @@ -83,6 +93,7 @@ SME server - phpldapadmin for smeserver %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build perl createlinks