--- rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders.spec	2021/08/23 14:47:47	1.5
+++ rpms/smeserver-shared-folders/contribs10/smeserver-shared-folders.spec	2022/08/01 04:17:51	1.8
@@ -1,4 +1,4 @@
-# $Id: smeserver-shared-folders.spec,v 1.4 2021/04/01 08:17:36 brianr Exp $
+# $Id: smeserver-shared-folders.spec,v 1.7 2022/07/25 06:53:12 jpp Exp $
 # Authority: vip-ire
 # Name: Daniel Berteaud
 
@@ -6,7 +6,7 @@ Summary: sme server shared folders modul
 %define name smeserver-shared-folders
 Name: %{name}
 %define version 0.3
-%define release 15
+%define release 18
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,12 +25,15 @@ Patch9: smeserver-shared-folders-0.3-loc
 Patch10: smeserver-shared-folders-0.3-Imcomplete-Update-for-Server-Manager2.patch
 Patch11: smeserver-shared-folders-0.3-Add-Update-event-to-createlinks.patch
 Patch12: smeserver-shared-folders-0.3-locale-2021-08-23.patch
+Patch13: smeserver-shared-folders-0.3-bz11523-php-fpm.patch
+Patch14: smeserver-shared-folders-0.3-bz12060-httpd24.patch
 
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArchitectures: noarch
 Requires: e-smith-base >= 4.13.15-76
 Requires: perl(CGI::FormMagick)
 Requires: e-smith-formmagick >= 1.4.0-12
+Requires: e-smith-apache >= 2.6.0-19
 Requires: smeserver-mod_dav
 Requires: acl
 BuildRequires: perl
@@ -44,6 +47,16 @@ This module allows you to create network
 with more flexibility than ibays as it supports ACLs
 
 %changelog
+* Mon Aug 01 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-18.sme
+- update to httpd 2.4 access syntax [SME: 12060]
+  removed compat lines, added requires e-smith-apache >= 2.6.0-19
+
+* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-17.sme
+- update to httpd 2.4 access syntax [SME: 12060]
+
+* Mon Jul 25 2022 Jean-Philippe Pialasse <tests@pialasse.com> 0.3-16.sme
+- merge php-fpm code [SME: 11523]
+
 * Mon Aug 23 2021 Terry Fage <terry.fage@gmail.com> 0.3-11.sme
 - apply locale 2021-08-23 patch
 
@@ -408,6 +421,8 @@ with more flexibility than ibays as it s
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
+%patch14 -p1
 
 %pre
 /usr/sbin/useradd -c "Rsyncd User" \