--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2022/07/08 05:32:55	1.23
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2022/07/08 19:09:44	1.26
@@ -1,4 +1,4 @@
-%define release 16
+%define release 18
 %define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
@@ -24,8 +24,8 @@ Patch13: smeserver-nextcloud-1.2.0-bz113
 Patch14: smeserver-nextcloud-1.2.0-bz11972-rewriterules.patch
 Patch15: smeserver-nextcloud-1.2.0-bz12094-use-src.patch
 Patch16: smeserver-nextcloud-1.2.0-bz12016-backup.patch
-
-# for later smeserver-nextcloud-1.2.0-bz12053-httpd24.patch
+Patch17: smeserver-nextcloud-1.2.0-bz12096-bz12095.patch
+Patch18: smeserver-nextcloud-1.2.0-bz12053-httpd24.patch
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
@@ -50,8 +50,8 @@ Requires: php74-php-pecl-imagick
 Requires: php74-php-gmp
 Requires: jq
 Requires: smeserver-mariadb105
-#httpd24 Requires: e-smith-apache >= 2.6.0-19
-#httpd24 Requires: smeserver-php >= 3.0.0-43
+Requires: e-smith-apache >= 2.6.0-19
+Requires: smeserver-php >= 3.0.0-43
 
 %description
 Koozali SME Server Nextcloud files and configuration.
@@ -76,8 +76,9 @@ Koozali SME Server Nextcloud files and c
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
+%patch17 -p1
+%patch18 -p1
 
-# TODO patch httpd24
 
 %build
 perl createlinks
@@ -108,13 +109,20 @@ cat %{name}-%{version}-filelist
 
 
 %changelog
+* Fri Jul 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-18.sme
+- update httpd fragment for httpd2.4 syntax [SME: 12053]
+
+* Fri Jul 08 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-17.sme
+- fix gencache again [SME: 12096]
+- fix ldap users/groups not availables on first run [SME: 12095]
+
 * Thu Jul 07 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-16.sme
 - migrate property CloudDomain to VirtualHost [SME: 11918]
 - use mariadb105 on new installs [SME: 11343]
 - update rewriterules [SME: 11972]
 - update to NC24 [SME: 12094]
   use a nextcloud-src rpm and avoid conflicts between web and rpm updates
-- add to backup
+- add to backup [SME: 12016]
 
 * Fri May 20 2022 Terry Fage <terry@fage.au> 1.2.0-15.sme
 - fix cron syntax error [SME: 11854]