--- rpms/smeserver-affa/contribs10/smeserver-affa.spec	2020/10/07 09:57:10	1.1
+++ rpms/smeserver-affa/contribs10/smeserver-affa.spec	2021/03/23 14:27:50	1.2
@@ -1,8 +1,8 @@
-Summary: A rsync-based backup program for linux, adapted to sme server 8-9
+Summary: A rsync-based backup program for linux, adapted to Koozali SME server 10
 %define name smeserver-affa
 Name: %{name}
-%define version 3.2.2.3
-%define release 8
+%define version 3.3.0
+%define release 1
 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>
@@ -11,44 +11,41 @@ Group: Applications/Archiving
 Source: %{name}-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
+BuildRequires: e-smith-devtools
+
 AutoReq: no
 
+Requires: e-smith-release >= 10
 Requires: openssh-clients
 Requires: perl-Config-IniFiles
 Requires: perl-Filesys-DiskFree
 Requires: perl-MailTools
 Requires: perl-Proc-ProcessTable
 Requires: perl-TimeDate 
+Requires: perl-List-MoreUtils
 Requires: rsync
 
-Patch1: smeserver-affa-fix-typo.patch
-Patch2: smeserver-affa-fix-rise_RPMCheck_smb_diskusage.patch
-Patch3: smeserver-affa-fix-ssh-port.patch
-Patch4: smeserver-affa-fix-blanks-conf.patch
-Patch5: smeserver-affa-fix-imapfiles-find.patch
-Patch6: smeserver-affa-fix-show-schedule.patch
+#Patch1: smeserver-affa-something.patch
 
 %description
-Affa is a rsync-based backup program
-Documentation: http://affa.sf.net
-with SMEServer + RPMCheck + Watchdog + rise
+Affa is a rsync-based backup program for SMEServer + RPMCheck + Watchdog + rise.  Documentation: http://affa.sf.net 
 
 %prep
+rm -rf $RPM_BUILD_ROOT
+
 %setup -q -n %{name}-%{version}
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
+#%patch1 -p1
 
 %build
+# perl createlinks << if required
+find . \( -name .gitinclude -o -name .gitignore \) -print0 | \
+    xargs -0 rm -f
 
 %install
-rm -rf $RPM_BUILD_ROOT
-rm -f %{name}-%{version}-filelist
-(cd root   ;find . -depth -print | cpio -dump $RPM_BUILD_ROOT)
 
+/bin/rm -rf $RPM_BUILD_ROOT
+(cd root   ;/usr/bin/find . -depth -print | /bin/cpio -dump $RPM_BUILD_ROOT)
+/bin/rm -f %{name}-%{version}-filelist
 
 # Set version String
 cp -a $RPM_BUILD_ROOT/sbin/affa $RPM_BUILD_ROOT/sbin/affa.tmp
@@ -56,34 +53,21 @@ VERSIONSTRING=%{version}-`echo %{release
 sed -e "s/my \$VERSION.*;/my \$VERSION='$VERSIONSTRING';/" < $RPM_BUILD_ROOT/sbin/affa.tmp > $RPM_BUILD_ROOT/sbin/affa
 rm -f $RPM_BUILD_ROOT/sbin/affa.tmp
 
-rm -f %{name}-%{version}-filelist
-
-find $RPM_BUILD_ROOT -depth -type f -print |\
- sed -e "s@^$RPM_BUILD_ROOT@@g" \
- -e "s@^/sbin/@%attr(0750,root,root) &@"\
- -e "s@^/etc/profile.d/@%attr(0555,root,root) &@"\
- -e "s@^/etc/sudoers.d/@%attr(0440,root,root) &@"\
- -e "s@^/etc/cron.d/@%attr(0444,root,root)%config(noreplace) &@"\
- -e "s@^/usr/lib/affa/LICENSE@%attr(0444,root,root) &@"\
- -e "s@^/usr/lib/affa/WARRANTY@%attr(0444,root,root) &@"\
- -e "s@^/usr/man/man1/@%attr(0444,root,root) &@"\
- -e "s@^/etc/affa/scripts/@%attr(0750,root,root)%config(noreplace) &@"\
- -e "s@^/etc/affa/@%attr(0640,root,root)%config(noreplace) &@"\
- >> %{name}-%{version}-filelist
+/sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+    --ignoredir "/etc/sudoers.d" \
+    --ignoredir "/etc/profile.d" \
+    --file "/etc/profile.d/affa.sh" "attr(0555,root,root)" \
+    --file "/etc/sudoers.d/affa" "attr(0440,root,root)" \
+    > %{name}-%{version}-filelist
 
+%files -f %{name}-%{version}-filelist
 
-find $RPM_BUILD_ROOT -depth -type d -print |\
- sed -e "s@^$RPM_BUILD_ROOT@%dir @g" >> %{name}-%{version}-filelist
-
-find $RPM_BUILD_ROOT -depth -type l -print |\
- sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-%{version}-filelist
+# We could use this for docs I guess - we should standardise this sort of thing
+#%doc README LICENSE README
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%files -f %{name}-%{version}-filelist
-%defattr(-,root,root)
-
 %pre
 exit 0
 
@@ -97,6 +81,12 @@ exit 0
 exit 0
 
 %changelog
+* Tue Mar 23 2020 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
+- Very Alpha - see bug for details
+
 * Mon Apr 10 2017 Arnaud Guillaume <smeserver-affa@guedel.eu> 3.2.2.3-8.sme
 - Fix issue when multiple times are in an Affa configuration file, show-schedule only displays the last [SME: 10196]
 
@@ -158,7 +148,7 @@ exit 0
   --send-key: mkdir of RemoteAuthorizedKeysFile. Avoid errors if dir does not exist
   --log-tail: show last rotated if current log is empty or too short
   --check-conncetions: allow jobs as arguments 
-* Sun Aug 29 2011 Michael Weinberger 3.1.2
+* Mon Aug 29 2011 Michael Weinberger 3.1.2
 - Bugfix: postJobCommand and postJobCommandRemote were not executed
 * Sat Aug 13 2011 Michael Weinberger 3.1.1
 - process state 'rsync interrupted' and 'dedup interrupted'