--- rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/03/29 13:15:26	1.3
+++ rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/09/22 14:48:04	1.7
@@ -2,7 +2,7 @@ Summary: A rsync-based backup program fo
 %define name smeserver-affa
 Name: %{name}
 %define version 3.3.1
-%define release 1
+%define release 5
 Version: %{version}
 Release: %{release}%{?dist}
 Vendor: Michael Weinberger <mweinber AT users DOT sourceforge DOT net> //// adaptation to sme-server Arnaud Guillaume <smeserver-affa AT guedel DOT eu>
@@ -16,6 +16,7 @@ BuildRequires: e-smith-devtools
 AutoReq: no
 
 Requires: e-smith-release >= 10
+Requires: smeserver-systemd-control
 Requires: openssh-clients
 Requires: perl-Config-IniFiles
 Requires: perl-Filesys-DiskFree
@@ -25,7 +26,10 @@ Requires: perl-TimeDate
 Requires: perl-List-MoreUtils
 Requires: rsync
 
-#Patch1: smeserver-affa-something.patch
+Patch1: smeserver-affa-add-some-systemd-support.patch
+Patch2: smeserver-affa-change-host-domain.patch
+Patch3: smeserver-affa-change_to_rsa_keys.patch
+Patch4: smeserver-affa-update-ssh-keys-links.patch
 
 %description
 Affa is a rsync-based backup program for SMEServer + RPMCheck + Watchdog + rise.  Documentation: http://affa.sf.net 
@@ -34,7 +38,10 @@ Affa is a rsync-based backup program for
 rm -rf $RPM_BUILD_ROOT
 
 %setup -q -n %{name}-%{version}
-#%patch1 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 %build
 # perl createlinks << if required
@@ -84,6 +91,20 @@ exit 0
 exit 0
 
 %changelog
+* Wed Sep 22 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-5
+- Modify ssh key links [SME: 10783]
+- Untidy the ssh commands so I can see them and tidy them more easily
+
+* Wed Sep 22 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-4
+- Change ssh keys from DSA to RSA 4096 [SME: 10783]
+- Fix missing /var/affa store dir
+
+* Tue Sep 21 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-3.sme
+- Fix some syntax errors. Migrate to using HostName/DomainName
+
+* Tue Sep 21 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-2.sme
+- Add some systemd support [SME: 11024]
+
 * Mon Mar 29 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-1.sme
 - Fix Warranty [SME: 11500]
 - Fix Licence [SME: 11501]