Skip to content

Commit 78f3439

Browse files
jeckersbcgwalters
authored andcommitted
specfile: Handle updated macros in c9s rust-toolset
Closes: #1640 Signed-off-by: John Eckersberg <[email protected]>
1 parent 69395c3 commit 78f3439

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

contrib/packaging/bootc.spec

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

14+
%global rust_minor %(rustc --version | cut -f2 -d" " | cut -f2 -d".")
15+
16+
# https://github.com/bootc-dev/bootc/issues/1640
17+
%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
18+
%global new_cargo_macros 1
19+
%else
20+
%global new_cargo_macros 0
21+
%endif
22+
1423
Name: bootc
1524
Version: 1.1.5
1625
Release: 1%{?dist}
@@ -87,7 +96,7 @@ rm vendor-config.toml
8796

8897
%build
8998
# Build the main bootc binary
90-
%if 0%{?fedora} || 0%{?rhel} >= 10
99+
%if %new_cargo_macros
91100
%cargo_build %{?with_rhsm:-f rhsm}
92101
%else
93102
%cargo_build %{?with_rhsm:--features rhsm}
@@ -96,7 +105,7 @@ rm vendor-config.toml
96105
# Build the system reinstallation CLI binary
97106
%global cargo_args -p system-reinstall-bootc
98107
export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
99-
%if 0%{?fedora} || 0%{?rhel} >= 10
108+
%if %new_cargo_macros
100109
# In cargo-rpm-macros, the cargo_build macro does flag processing,
101110
# so we need to pass '--' to signify that cargo_args is not part
102111
# of the macro args

0 commit comments

Comments
 (0)