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/rear.git#b533c38365fa110b077028e2c2b91b1184dcd357
This commit is contained in:
DistroBaker 2021-03-11 20:22:00 +00:00
parent cca72f25b7
commit adca678c6c

View File

@ -3,7 +3,7 @@
Name: rear Name: rear
Version: 2.6 Version: 2.6
Release: 4%{?dist} Release: 5%{?dist}
Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool
URL: http://relax-and-recover.org/ URL: http://relax-and-recover.org/
License: GPLv3 License: GPLv3
@ -80,6 +80,16 @@ Professional services and support are available.
%prep %prep
%autosetup -p1 %autosetup -p1
# Change /lib to /usr/lib for COPY_AS_IS
sed -E -e "s:([\"' ])/lib:\1/usr/lib:g" \
-i usr/share/rear/prep/GNU/Linux/*include*.sh
# Same for Linux.conf
sed -e 's:/lib/:/usr/lib/:g' \
-e 's:/lib\*/:/usr/lib\*/:g' \
-e 's:/usr/usr/lib:/usr/lib:g' \
-i 'usr/share/rear/conf/GNU/Linux.conf'
%build %build
# build HTML user guide # build HTML user guide
make doc make doc
@ -103,6 +113,9 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
#-- CHANGELOG -----------------------------------------------------------------# #-- CHANGELOG -----------------------------------------------------------------#
%changelog %changelog
* Fri Feb 26 2021 Christopher Engelhard <ce@lcts.de> - 2.6-5
- Change /lib to /usr/lib in scripts to fix RHBZ #1931112
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4 * Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.6-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild