Add a bcond for ostree_ext
This pairs with https://src.fedoraproject.org/rpms/bootc/pull-request/4 Resolves: #RHEL-72585
This commit is contained in:
parent
0f4a2e420a
commit
503e6398d1
@ -32,6 +32,8 @@ BuildRequires: rust
|
||||
%bcond_with sanitizers
|
||||
# Embedded unit tests
|
||||
%bcond_with bin_unit_tests
|
||||
# Don't add the ostree-container binaries
|
||||
%bcond_without ostree_ext
|
||||
|
||||
# This is copied from the libdnf spec
|
||||
%if 0%{?rhel} && ! 0%{?centos}
|
||||
@ -149,6 +151,11 @@ Requires: fuse
|
||||
Requires: fuse3
|
||||
%endif
|
||||
|
||||
# ref https://github.com/coreos/rpm-ostree/issues/4994
|
||||
Requires: bootc
|
||||
%if %{without ostree_ext}
|
||||
Requires: ostree-cli(ostree-container)
|
||||
%endif
|
||||
# For container functionality
|
||||
# https://github.com/coreos/rpm-ostree/issues/3286
|
||||
Requires: skopeo
|
||||
@ -202,6 +209,9 @@ export RUSTFLAGS="%{build_rustflags}"
|
||||
|
||||
%install
|
||||
%make_install INSTALL="install -p -c"
|
||||
%if %{without ostree_ext}
|
||||
rm -vrf $RPM_BUILD_ROOT/usr/libexec/libostree/ext
|
||||
%endif
|
||||
find $RPM_BUILD_ROOT -name '*.la' -delete
|
||||
|
||||
# I try to do continuous delivery via rpmdistro-gitoverlay while
|
||||
@ -238,7 +248,9 @@ $PYTHON autofiles.py > files \
|
||||
'%{_sysconfdir}/rpm-ostreed.conf' \
|
||||
'%{_prefix}/lib/systemd/system/*' \
|
||||
'%{_libexecdir}/rpm-ostree*' \
|
||||
%if %{with ostree_ext}
|
||||
'%{_libexecdir}/libostree/ext/*' \
|
||||
%endif
|
||||
'%{_datadir}/polkit-1/actions/*.policy' \
|
||||
'%{_datadir}/dbus-1/system-services/*' \
|
||||
'%{_datadir}/bash-completion/completions/*'
|
||||
|
Loading…
Reference in New Issue
Block a user