diff --git a/.tito/packages/BackupPC4 b/.tito/packages/BackupPC4 index e949979..1fb1345 100644 --- a/.tito/packages/BackupPC4 +++ b/.tito/packages/BackupPC4 @@ -1 +1 @@ -4.2.1-1 ./ +4.2.1-2 ./ diff --git a/BackupPC4.spec b/BackupPC4.spec index f66280e..bd9ba63 100644 --- a/BackupPC4.spec +++ b/BackupPC4.spec @@ -17,7 +17,7 @@ Name: %{realname}4 Version: 4.2.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: High-performance backup system Group: Applications/System License: GPLv2+ @@ -35,6 +35,9 @@ Source5: backuppc.service Source6: BackupPC.tmpfiles Source7: README.RHEL +# Count common rsync xfer errors +Patch0: BackupPC4-4.2.1-count_rsync_xfer_errors.patch + BuildRequires: %{_bindir}/smbclient, %{_bindir}/nmblookup BuildRequires: rsync BuildRequires: coreutils @@ -112,6 +115,8 @@ configurable and easy to install and maintain. %setup -q -n %{realname}-%{version} +%patch0 -p1 + for f in ChangeLog; do iconv -f ISO-8859-1 -t UTF-8 $f > $f.utf && mv $f.utf $f done @@ -353,6 +358,11 @@ fi %endif %changelog +* Mon Nov 05 2018 Daniel Berteaud 4.2.1-2 +- Backport commit to count common rsync xfer errors GLPI #34026 https://github. + com/backuppc/backuppc/commit/f5904a1f40f20fa76f43c23d12dacddba116a8d4 + (daniel@firewall-services.com) + * Mon May 14 2018 Daniel Berteaud 4.2.1-1 - Update to 4.2.1