--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/11/08 20:18:22	1.1
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/11/16 10:15:19	1.7
@@ -1,5 +1,5 @@
-%define release 19
-%define version 1.1.0
+%define release 5
+%define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
 Name: smeserver-nextcloud
@@ -7,47 +7,32 @@ Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
 Source: %{name}-%{version}.tar.gz
-Patch0: smeserver-nextcloud-1.1.0.patch0.patch
-Patch1: smeserver-nextcloud-1.1.0.bz10556.patch
-Patch2: smeserver-nextcloud-1.1.0-bz10560-logrotate.patch
-Patch3: smeserver-nextcloud-1.1.0-bz10558-logincredentials.patch
-Patch4: smeserver-nextcloud-1.1.0-bz10559-shares.patch
-Patch5: smeserver-nextcloud-1.1.0-bz10557-ibays_folder.patch
-Patch6: smeserver-nextcloud-1.1.0-bz10560-signal-event-hang.patch
-Patch7: smeserver-nextcloud-1.1.0-bz10564-improve-shares.patch
-Patch8: smeserver-nextcloud-1.1.0-bz10564-fixIncludes-longUpdate.patch
-Patch9: smeserver-nextcloud-1.1.0-bz10608-fail2ban.patch
-Patch10: smeserver-nextcloud-1.1.0-bz10596-fix-update.patch
-Patch11: smeserver-nextcloud-1.1.0-bz10695-memory-limit.patch
-Patch12: smeserver-nextcloud-1.1.0-bz10709-well-known.patch
-Patch13: smeserver-nextcloud-1.1.0-bz10711-occ-command.patch
-Patch14: smeserver-nextcloud-1.1.0-bz10710-dbcolumnupdate.patch
-Patch15: smeserver-nextcloud-1.1.0-bz10728-OCC512.patch
-Patch16: smeserver-nextcloud-1.1.0.bz10852.php72.patch
-Patch17: smeserver-nextcloud-1.1.0.bz11003-php73.patch
-Patch18: smeserver-nextcloud-1.1.0.bz11083-phpbasedir.patch
-Patch19: smeserver-nextcloud-1.1.0.bz11084-idletimeout.patch
-Patch20: smeserver-nextcloud-1.1.0-bz10885-dedicateddomain.patch 
+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
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
 
 BuildRequires: e-smith-devtools
 
-Requires: nextcloud >= 13.0.1
+Requires: nextcloud >= 20.0.1
 Requires: e-smith-apache
 Requires: e-smith-mysql
 Requires: smeserver-webapps-common
-Requires: smeserver-php-fpm >= 0.1.1-3
+Requires: smeserver-php >= 3.0.0-15
 Requires: samba-client
 Requires: perl-JSON
-Requires: php73-php-smbclient
-Requires: php73-php-opcache
-Requires: php73-php-pecl-apcu
-Requires: php73-php-pecl-inotify
-Requires: php73-php-pecl-zip
-Requires: php73-php-pecl-imagick
-Requires: php73-php-gmp
+Requires: perl-Exporter-Tiny
+Requires: perl-Sub-Quote
+Requires: php74-php-smbclient
+Requires: php74-php-opcache
+Requires: php74-php-pecl-apcu
+Requires: php74-php-pecl-inotify
+Requires: php74-php-pecl-zip
+Requires: php74-php-pecl-imagick
+Requires: php74-php-gmp
 
 
 %description
@@ -60,25 +45,6 @@ Koozali SME Server Nextcloud files and c
 %patch1 -p1
 %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
-%patch15 -p1
-%patch16 -p1
-touch root/etc/e-smith/templates/etc/opt/remi/php72/php.d/20-opcache.ini/template-begin
-%patch17 -p1
-touch root/etc/e-smith/templates/etc/opt/remi/php73/php.d/20-opcache.ini/template-begin
-%patch18 -p1
-%patch19 -p1
-%patch20 -p1
 
 %build
 perl createlinks
@@ -95,6 +61,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
 
@@ -105,6 +73,26 @@ cat %{name}-%{version}-filelist
 
 
 %changelog
+* 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]
+
+* Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.2.0-1.sme
+- initial SME10 import [SME: 11086]
+
 * Sun Nov 08 2020 Jean-Philipe Pialasse <tests@pialasse.com> 1.1.0-19.sme
 - use php73-fpm [SME: 11003]
 - Require php-gmp for Nextcloud 19 and newer [SME: 11004]