--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/12/01 14:23:26	1.8
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2022/07/08 05:16:10	1.21
@@ -1,4 +1,4 @@
-%define release 6
+%define release 16
 %define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
@@ -12,6 +12,18 @@ Patch1: smeserver-nextcloud-1.2.0.bz1108
 Patch2: smeserver-nextcloud-1.2.0.bz11086-add-missing-conf-details.patch
 Patch3: smeserver-nextcloud-1.2.0.bz11171-template-min-max-start-servers.patch
 Patch4: smeserver-nextcloud-1.2.0.bz11171-check-min-max-start-servers.patch
+Patch5: smeserver-nextcloud-1.2.0.bz11268-fix-typo-php-pool-template.patch
+Patch6: smeserver-nextcloud-1.2.0-bz11086.patch
+Patch7: smeserver-nextcloud-1.2.0-bz11086-dav-externalfs.patch
+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
+
+# for later smeserver-nextcloud-1.2.0-bz12053-httpd24.patch
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
@@ -34,7 +46,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.
@@ -47,6 +62,18 @@ Koozali SME Server Nextcloud files and c
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+
+# TODO patch httpd24
 
 %build
 perl createlinks
@@ -66,6 +93,8 @@ mkdir -p root/var/log/php/nextcloud
  --ignoredir "/etc/sudoers.d" \
  --file "/etc/sudoers.d/90_nextcloud" "attr(0440,root,root)" \
  --file /usr/bin/OCC 'attr(0755,root,root)'\
+ --file /usr/bin/occ 'attr(0755,root,root)'\
+ --file /usr/bin/nc_dbupdate 'attr(0755,root,root)'\
  > %{name}-%{version}-filelist
 
 cat %{name}-%{version}-filelist
@@ -75,6 +104,40 @@ 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]
+
+* 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
+
+* Wed May 18 2022 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-12.sme
+- use php_pecl-apcu for cli [SME: 11920]
+- db update of keys and indexes [SME: 11854]
+- few nextcloud-occ-conf fixes [SME: 11973]
+  make occ used in scripts rather than OCC
+
+* Sun Jun 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-11.sme
+- fix logrotate error [SME: 11172]
+- fix noise in error log
+
+* Sun Jun 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-9.sme
+- fix dav redirections for domain use and subdir  [SME: 11086]
+- refresh externalfs on loading, best for ibays
+- tidying 
+
+* Sun Jun 06 2021 Jean-Philippe Pialasse <tests@pialasse.com> 1.2.0-8.sme
+- add update event [SME: 11086] 
+- add occ as hard link of OCC
+
+* Fri Dec 18 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-7.sme
+- Fix typo in php pool template [SME: 11268]
+
 * Tue Dec 01 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-6.sme
 - Add a check for the Min/Max/Start servers [SME: 11171]
 - https://bugs.contribs.org/show_bug.cgi?id=11171#c4