--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2022/05/19 04:01:27	1.16
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2022/07/08 05:38:14	1.24
@@ -1,4 +1,4 @@
-%define release 14
+%define release 16
 %define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
@@ -18,13 +18,21 @@ Patch7: smeserver-nextcloud-1.2.0-bz1108
 Patch8: smeserver-nextcloud-1.2.0-bz11172-logrotate.patch
 Patch9: smeserver-nextcloud-1.2.0-bz11920-bz11854-bz11973.patch
 Patch10: smeserver-nextcloud-1.2.0-bz11855-gencache.patch
+Patch11: smeserver-nextcloud-1.2.0-bz11854.patch
+Patch12: smeserver-nextcloud-1.2.0-bz11918-migrateloudDomain2VirtualHost.patch
+Patch13: smeserver-nextcloud-1.2.0-bz11343-mariadb105.patch
+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
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
 
 BuildRequires: e-smith-devtools
 
-Requires: nextcloud >= 20.0.1
+Requires: nextcloud-src >= 24.0.1
 Requires: e-smith-apache
 Requires: e-smith-mysql
 Requires: smeserver-webapps-common
@@ -40,7 +48,10 @@ Requires: php74-php-pecl-inotify
 Requires: php74-php-pecl-zip
 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
 
 %description
 Koozali SME Server Nextcloud files and configuration.
@@ -59,6 +70,14 @@ Koozali SME Server Nextcloud files and c
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+
+# TODO patch httpd24
 
 %build
 perl createlinks
@@ -89,6 +108,17 @@ cat %{name}-%{version}-filelist
 
 
 %changelog
+* 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 [SME: 12016]
+
+* Fri May 20 2022 Terry Fage <terry@fage.au> 1.2.0-15.sme
+- fix cron syntax error [SME: 11854]
+
 * Wed May 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-14.sme
 - fix gencache_init failed [SME: 11855]
   fix missing nextcloud-conf action in update event