Skip to content

Commit 500e655

Browse files
committed
specfile: Handle updated macros in c9s rust-toolset
Closes: #1640 Signed-off-by: John Eckersberg <[email protected]>
1 parent b010983 commit 500e655

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

contrib/packaging/bootc.spec

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
%bcond_with rhsm
1212
%endif
1313

14+
%define rust_minor %(rustc --version | cut -f2 -d" " | cut -f2 -d".")
15+
1416
Name: bootc
1517
Version: 1.1.5
1618
Release: 1%{?dist}
@@ -87,7 +89,7 @@ rm vendor-config.toml
8789

8890
%build
8991
# Build the main bootc binary
90-
%if 0%{?fedora} || 0%{?rhel} >= 10
92+
%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
9193
%cargo_build %{?with_rhsm:-f rhsm}
9294
%else
9395
%cargo_build %{?with_rhsm:--features rhsm}
@@ -96,7 +98,7 @@ rm vendor-config.toml
9698
# Build the system reinstallation CLI binary
9799
%global cargo_args -p system-reinstall-bootc
98100
export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
99-
%if 0%{?fedora} || 0%{?rhel} >= 10
101+
%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
100102
# In cargo-rpm-macros, the cargo_build macro does flag processing,
101103
# so we need to pass '--' to signify that cargo_args is not part
102104
# of the macro args

0 commit comments

Comments
 (0)