AlmaLinux changes

This commit is contained in:
Andrew Lukoshko 2021-09-15 10:10:09 +00:00
parent 4f024df730
commit 284df1d1cd
1 changed files with 10 additions and 1 deletions

View File

@ -1,3 +1,4 @@
%global dist %{?dist}.alma
%global _hardened_build 1
# Architectures that we run the basic sanity-check test.
@ -843,7 +844,10 @@ sed 's/@VERSION@/%{version}/g' < %{SOURCE4} > README
ip addr list ||:
ip route list ||:
if ping -c 3 -w 20 8.8.8.8 && wget http://libguestfs.org -O /dev/null; then
extra=
# AlmaLinux: avoid permission denied for yum/dnf cache
mkdir cachedir
sed -e "s|/var/cache/yum|$(pwd)/cachedir|" -e "s|/var/cache/dnf|$(pwd)/cachedir|" /etc/dnf/dnf.conf > yum.conf
extra=--with-supermin-packager-config=$(pwd)/yum.conf
else
mkdir cachedir repo
# -n 1 because of RHBZ#980502.
@ -866,6 +870,7 @@ export PYTHON=%{__python3}
--disable-erlang \
--disable-golang \
--with-gtk=no \
--with-distro=REDHAT \
$extra
# Building index-parse.c by hand works around a race condition in the
@ -1279,6 +1284,10 @@ install -m 0644 utils/boot-benchmark/boot-benchmark.1 $RPM_BUILD_ROOT%{_mandir}/
%changelog
* Sun Apr 11 2021 Andrew Lukoshko <alukoshko@almalinux.org> - 1:1.40.2-27.alma
- Fix build for AlmaLinux
- Avoid permission denied for yum/dnf cache
* Tue Jan 05 2021 Richard W.M. Jones <rjones@redhat.com> - 1:1.40.2-27
- selinux-relabel does not work if SELINUXTYPE != targeted
- tar-in command does not allow restoring file capabilities