--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/11/09 02:52:58	1.4
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/12/18 11:18:59	1.9
@@ -1,4 +1,4 @@
-%define release 2
+%define release 7
 %define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
@@ -8,6 +8,11 @@ Release: %{release}%{?dist}
 License: GPL
 Source: %{name}-%{version}.tar.gz
 Patch0: smeserver-nextcloud-1.2.0-bz10876-username-for-ldap.patch
+Patch1: smeserver-nextcloud-1.2.0.bz11086-db-phpver-typo.patch
+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
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
@@ -21,6 +26,8 @@ Requires: smeserver-webapps-common
 Requires: smeserver-php >= 3.0.0-15
 Requires: samba-client
 Requires: perl-JSON
+Requires: perl-Exporter-Tiny
+Requires: perl-Sub-Quote
 Requires: php74-php-smbclient
 Requires: php74-php-opcache
 Requires: php74-php-pecl-apcu
@@ -37,6 +44,11 @@ Koozali SME Server Nextcloud files and c
 %prep
 %setup
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
 
 %build
 perl createlinks
@@ -53,6 +65,8 @@ mkdir -p root/var/log/php/nextcloud
  --dir /var/lib/php/nextcloud/session 'attr(0755,www,www)' \
  --dir /home/e-smith/files/nextcloud 'attr(0755,www,www)' \
  --dir /home/e-smith/files/nextcloud/data 'attr(0755,www,www)' \
+ --ignoredir "/etc/sudoers.d" \
+ --file "/etc/sudoers.d/90_nextcloud" "attr(0440,root,root)" \
  --file /usr/bin/OCC 'attr(0755,root,root)'\
  > %{name}-%{version}-filelist
 
@@ -63,6 +77,27 @@ cat %{name}-%{version}-filelist
 
 
 %changelog
+* 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
+
+* Mon Nov 16 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-5.sme
+- Template missing Min/Start/Max Servers and Children [SME: 11171]
+
+* Thu Nov 12 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-4.sme
+- Add missing SMB configuration details including domain/workgroup
+
+* Mon Nov 09 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 1.2.0-3.sme
+- Fix sudoer file permissions in file list
+- Fix some install bugs
+- typo in httpd.conf
+- switch db from mysql to maria db
+- update php version
+- add Requires
+
 * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.2.0-2.sme
 - use username as id in place of ldap uuid [SME: 10876]