/[smecontribs]/rpms/smeserver-affa/contribs10/smeserver-affa.spec

Diff of /rpms/smeserver-affa/contribs10/smeserver-affa.spec

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-Revision 1.1 by brianr,
Wed Oct  7 09:57:10 2020 UTC
+Revision 1.12 by jcrisp,
Tue Jul  5 13:16:35 2022 UTC
 Line 1
- 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 version 3.3.1
- %define release 8
+ %define release 11
  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>
 Line 11 
 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: smeserver-systemd-control
  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
+ Patch1: smeserver-affa-add-some-systemd-support.patch
- Patch2: smeserver-affa-fix-rise_RPMCheck_smb_diskusage.patch
+ Patch2: smeserver-affa-change-host-domain.patch
- Patch3: smeserver-affa-fix-ssh-port.patch
+ Patch3: smeserver-affa-change_to_rsa_keys.patch
- Patch4: smeserver-affa-fix-blanks-conf.patch
+ Patch4: smeserver-affa-update-ssh-keys-links.patch
- Patch5: smeserver-affa-fix-imapfiles-find.patch
+ Patch5: smeserver-affa-fix-config-directory-name-spaces.patch
- Patch6: smeserver-affa-fix-show-schedule.patch
+ Patch6: smeserver-affa-fix-reporting-error.patch
+ Patch7: smeserver-affa-fix-ssh-knownhosts-error.patch
+ Patch8: smeserver-affa-fix-reporting-error-syntax.patch
+ Patch9: smeserver-affa-fix-reporting-error-2.patch
+ Patch10: smeserver-affa-fix-reporting-error-3.patch
  %description
- Affa is a rsync-based backup program
+ Affa is a rsync-based backup program for SMEServer + RPMCheck + Watchdog + rise.  Documentation: http://affa.sf.net
- Documentation: http://affa.sf.net
- with SMEServer + RPMCheck + Watchdog + rise
  %prep
+ rm -rf $RPM_BUILD_ROOT
  %setup -q -n %{name}-%{version}
  %patch1 -p1
  %patch2 -p1
-Line 41 
 with SMEServer + RPMCheck + Watchdog + r
+Line 50 
 with SMEServer + RPMCheck + Watchdog + r
  %patch4 -p1
  %patch5 -p1
  %patch6 -p1
+ %patch7 -p1
+ %patch8 -p1
+ %patch9 -p1
+ %patch10 -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
-Line 56 
 VERSIONSTRING=%{version}-`echo %{release
+Line 72 
 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
+ /sbin/e-smith/genfilelist $RPM_BUILD_ROOT \
+     --ignoredir "/etc/sudoers.d" \
- find $RPM_BUILD_ROOT -depth -type f -print |\
+     --ignoredir "/etc/profile.d" \
-  sed -e "s@^$RPM_BUILD_ROOT@@g" \
+     --file "/etc/profile.d/affa.sh" "attr(0555,root,root)" \
-  -e "s@^/sbin/@%attr(0750,root,root) &@"\
+     --file "/etc/sudoers.d/affa" "attr(0440,root,root)" \
-  -e "s@^/etc/profile.d/@%attr(0555,root,root) &@"\
+     > %{name}-%{version}-filelist
-  -e "s@^/etc/sudoers.d/@%attr(0440,root,root) &@"\
-  -e "s@^/etc/cron.d/@%attr(0444,root,root)%config(noreplace) &@"\
+ # We could use this for docs I guess - we should standardise this sort of thing
-  -e "s@^/usr/lib/affa/LICENSE@%attr(0444,root,root) &@"\
+ #%doc README LICENSE README
-  -e "s@^/usr/lib/affa/WARRANTY@%attr(0444,root,root) &@"\
+ echo "%doc LICENSE COPYING README WARRANTY" >> %{name}-%{version}-filelist
-  -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
- 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 |\
+ %files -f %{name}-%{version}-filelist
-  sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-%{version}-filelist
  %clean
  rm -rf $RPM_BUILD_ROOT
- %files -f %{name}-%{version}-filelist
- %defattr(-,root,root)
  %pre
  exit 0
-Line 97 
 exit 0
+Line 103 
 exit 0
  exit 0
  %changelog
+ * Tue Jul 05 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-11
+ - Update Regex to help clean out rsyncd.motd messages [SME: 12084]
+ * Mon Jul 04 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-10
+ - Redo patch at -8 to fix the next if syntax [SME: 12084]
+ * Mon Jul 04 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-9
+ - Fix my syntax errors from [SME: 11784]
+ * Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-8
+ - Fix KnownHosts error [SME: 12081]
+ - Thanks to 'gieres' for finding this
+ * Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-7
+ - Fix logging parse errors [SME: 12084]
+ - Thanks to 'sti' for finding it
+ * Thu Jun 30 2022 John Crisp <jcrisp@safeandsoundit.co.uk> 3.3.1-6
+ - Fix error with files with spaces in names - Credit to Trevor Drake-Brockman [SME: 11784]
+ - Fix directory search - Credit to Trevor Drake-Brockman [SME: 11784]
+ * 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]
+ - 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
+ - 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]
-Line 158 
 exit 0
+Line 210 
 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'

 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
 Legend:



Removed lines/characters
 


Changed lines/characters


 
Added lines/characters
-Removed lines/characters
+Added lines/characters

admin@koozali.org	ViewVC Help
Powered by ViewVC 1.2.1