Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rsync.git#df1e58ac0e969a5b9a5b31b3610eef955641a6f5
This commit is contained in:
DistroBaker 2021-02-04 14:38:28 +00:00
parent 64606fcd89
commit 834395b71e

View File

@ -10,8 +10,8 @@
Summary: A program for synchronizing files over a network Summary: A program for synchronizing files over a network
Name: rsync Name: rsync
Version: 3.2.3 Version: 3.2.3
Release: 4%{?dist} Release: 5%{?dist}
URL: http://rsync.samba.org/ URL: https://rsync.samba.org/
Source0: https://download.samba.org/pub/rsync/src/rsync-%{version}%{?prerelease}.tar.gz Source0: https://download.samba.org/pub/rsync/src/rsync-%{version}%{?prerelease}.tar.gz
Source1: https://download.samba.org/pub/rsync/src/rsync-patches-%{version}%{?prerelease}.tar.gz Source1: https://download.samba.org/pub/rsync/src/rsync-patches-%{version}%{?prerelease}.tar.gz
@ -21,6 +21,7 @@ Source4: rsyncd.conf
Source5: rsyncd.sysconfig Source5: rsyncd.sysconfig
Source6: rsyncd@.service Source6: rsyncd@.service
BuildRequires: make
BuildRequires: gcc gcc-c++ BuildRequires: gcc gcc-c++
BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, systemd BuildRequires: libacl-devel, libattr-devel, autoconf, popt-devel, systemd
BuildRequires: lz4-devel openssl-devel libzstd-devel BuildRequires: lz4-devel openssl-devel libzstd-devel
@ -81,8 +82,6 @@ make check
chmod -x support/* chmod -x support/*
%install %install
rm -rf $RPM_BUILD_ROOT
%{make_install} INSTALLCMD='install -p' INSTALLMAN='install -p' %{make_install} INSTALLCMD='install -p' INSTALLMAN='install -p'
install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.service install -D -m644 %{SOURCE3} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd.service
@ -92,7 +91,6 @@ install -D -m644 %{SOURCE5} $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/rsyncd
install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
%files %files
%{!?_licensedir:%global license %%doc}
%license COPYING %license COPYING
%doc support/ tech_report.tex %doc support/ tech_report.tex
%{_bindir}/%{name} %{_bindir}/%{name}
@ -118,6 +116,9 @@ install -D -m644 %{SOURCE6} $RPM_BUILD_ROOT/%{_unitdir}/rsyncd@.service
%systemd_postun_with_restart rsyncd.service %systemd_postun_with_restart rsyncd.service
%changelog %changelog
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Dec 08 2020 Michal Ruprich <mruprich@redhat.com> - 3.2.3-4 * Tue Dec 08 2020 Michal Ruprich <mruprich@redhat.com> - 3.2.3-4
- Resolves: #1894485 - rsync is unable to set permissions when chrooted - Resolves: #1894485 - rsync is unable to set permissions when chrooted
- Getting rid of deprecated makeinstall macro - Getting rid of deprecated makeinstall macro