--- rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/11/09 02:47:33	1.3
+++ rpms/smeserver-nextcloud/contribs10/smeserver-nextcloud.spec	2020/11/12 11:13:46	1.6
@@ -1,4 +1,4 @@
-%define release 2
+%define release 4
 %define version 1.2.0
 
 Summary: Koozali SME Server Nextcloud configuration
@@ -7,6 +7,9 @@ Version: %{version}
 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
 
 BuildArch: noarch
 URL: https://www.nextcloud.com 
@@ -20,6 +23,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
@@ -35,6 +40,9 @@ Koozali SME Server Nextcloud files and c
 
 %prep
 %setup
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 perl createlinks
@@ -51,6 +59,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
 
@@ -61,8 +71,19 @@ cat %{name}-%{version}-filelist
 
 
 %changelog
+* 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
-- fix [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]