--- rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/03/23 14:27:50	1.2
+++ rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/09/22 12:01:20	1.6
@@ -1,8 +1,8 @@
 Summary: A rsync-based backup program for linux, adapted to Koozali SME server 10
 %define name smeserver-affa
 Name: %{name}
-%define version 3.3.0
-%define release 1
+%define version 3.3.1
+%define release 4
 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,9 @@ 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
 
 %description
 Affa is a rsync-based backup program for SMEServer + RPMCheck + Watchdog + rise.  Documentation: http://affa.sf.net 
@@ -34,7 +37,9 @@ 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
 
 %build
 # perl createlinks << if required
@@ -60,10 +65,13 @@ rm -f $RPM_BUILD_ROOT/sbin/affa.tmp
     --file "/etc/sudoers.d/affa" "attr(0440,root,root)" \
     > %{name}-%{version}-filelist
 
-%files -f %{name}-%{version}-filelist
-
 # We could use this for docs I guess - we should standardise this sort of thing
 #%doc README LICENSE README
+echo "%doc LICENSE COPYING README WARRANTY" >> %{name}-%{version}-filelist
+
+
+
+%files -f %{name}-%{version}-filelist
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,7 +89,22 @@ exit 0
 exit 0
 
 %changelog
-* Tue Mar 23 2020 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.0-1.sme
+* 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]
+- Remove atalk [SME: 11503]
+
+* Tue Mar 23 2021 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.0-1.sme
 - New version for Koozali SME v10 [SME: 11024]
 - incorporated old patches
 - tidied up some old git files