--- rpms/smeserver-sogo/contribs10/smeserver-sogo.spec	2023/01/07 08:54:45	1.2
+++ rpms/smeserver-sogo/contribs10/smeserver-sogo.spec	2023/01/10 09:20:24	1.5
@@ -1,7 +1,7 @@
 # $Id$
 %define name smeserver-sogo
 %define version 1.6
-%define release 1
+%define release 2
 
 Name: %{name}
 Version: %{version}
@@ -11,13 +11,16 @@ Group:		Networking/Daemons
 License:	GPLv3+
 URL:		http://www.smeserver.org
 Source0:	%{name}-%{version}.tar.gz
+Patch0: smeserver-sogo-1.6-Update-to-SME10-Apache-2.4-and-systemd-dropin.patch
+Patch1: smeserver-sogo-1.6-Expand-koozali-preset-on-update.patch
+
 BuildArch:	noarch
 BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Epoch: 9
 BuildRequires:	e-smith-devtools
-Requires:	smeserver-release >= 9
+Requires:	smeserver-release >= 10
 Requires:	e-smith-ldap
-Requires:	sogo >= 2.3.0
+Requires:	sogo >= 5.8.0
 Requires:	sogo-tool
 Requires:	memcached
 Requires:	sogo-activesync
@@ -33,6 +36,8 @@ SME Server module for SOGo groupware.
 /bin/rm -rf /var/service/tinydns/root/data/ &> /dev/null
 
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
 [ -x createlinks ] && ./createlinks
@@ -46,7 +51,8 @@ rm -f %{name}-%{version}-filelist
 /sbin/e-smith/genfilelist \
     --dir /var/lib/sogo/GNUstep 'attr(0755,sogo,sogo)' \
     --dir /var/lib/sogo/GNUstep/Defaults 'attr(0755,sogo,sogo)' \
-    $RPM_BUILD_ROOT > %{name}-%{version}-%{release}-filelist
+    --ignoredir "/var/lib/sogo" \
+   $RPM_BUILD_ROOT > %{name}-%{version}-%{release}-filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -94,8 +100,16 @@ fi
 
 
 %changelog
-*  Sat Jan 07 2023 Brian Read <brianr@bjsystems.co.uk> - 1.6-1.sme
--  Initial import to SME10 tree
+* Mon Jan 09 2023 Brian Read <brianr@bjsystems.co.uk> 1.6-2.sme
+- Expand Koozali preset for systemd startup [SME: 11629]
+- Remove rc.d/rc7.d entries for memcached and sogod
+
+* Sat Jan 07 2023 Brian Read <brianr@bjsystems.co.uk> - 1.6-1.sme
+- Initial import to SME10 tree [SME: 11629]
+- Changes to spec file to avoid clash between sogo rpm directories and this rpm.
+- Update permissions to Apache 2.4
+- Add systemd dropin
+- Add -update event to createlinks
 
 * Fri Apr 28 2017 Stephane de Labrusse <stephdl@de-labrusse.fr> - 1.5-1.sme
 - Increase maximum IMAP command line length