Fix build on RPM systems

i8-stream-rhel
Arkady L. Shane 5 months ago
parent b9fb5e31fb
commit 5de62e5bb2
Signed by: tigro
GPG Key ID: 1EC08A25C9DB2503

@ -32,7 +32,7 @@ Summary: Access and modify virtual machine disk images
Name: libguestfs Name: libguestfs
Epoch: 1 Epoch: 1
Version: 1.44.0 Version: 1.44.0
Release: 9%{?dist} Release: 9%{?dist}.inferit
License: LGPLv2+ License: LGPLv2+
ExclusiveArch: x86_64 %{power64} aarch64 s390x ExclusiveArch: x86_64 %{power64} aarch64 s390x
@ -835,6 +835,10 @@ export PYTHON=%{__python3}
--disable-golang \ --disable-golang \
$extra $extra
# Fix build on RPM systems
sed -i 's@#QUERY_FILES_CMD := xargs rpm@QUERY_FILES_CMD := xargs rpm@g' \
appliance/Makefile
# Building index-parse.c by hand works around a race condition in the # Building index-parse.c by hand works around a race condition in the
# autotools cruft, where two or more copies of yacc race with each # autotools cruft, where two or more copies of yacc race with each
# other, resulting in a corrupted file. # other, resulting in a corrupted file.
@ -902,6 +906,12 @@ gzip --best installed-docs/*.xml
# Split up the monolithic packages file in the supermin appliance so # Split up the monolithic packages file in the supermin appliance so
# we can install dependencies in subpackages. # we can install dependencies in subpackages.
pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d pushd $RPM_BUILD_ROOT%{_libdir}/guestfs/supermin.d
echo "qemu-img" >> packages
echo "which" >> packages
echo "gfs2-utils" >> packages
echo "iputils" >> packages
echo "openssh-clients" >> packages
echo "vim-minimal" >> packages
function move_to function move_to
{ {
@ -1194,6 +1204,9 @@ rm ocaml/html/.gitignore
%changelog %changelog
* Thu May 30 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 1:1.44.0-9.inferit
- Fix build on RPM systems
* Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.44.0-9 * Sun Dec 10 2023 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 1:1.44.0-9
- Rebuilt for MSVSphere 8.8 - Rebuilt for MSVSphere 8.8

Loading…
Cancel
Save