File tree Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Expand file tree Collapse file tree 1 file changed +11
-2
lines changed Original file line number Diff line number Diff line change 11
11
%bcond_with rhsm
12
12
%endif
13
13
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
+
14
23
Name: bootc
15
24
Version: 1.1.5
16
25
Release: 1%{?dist }
@@ -87,7 +96,7 @@ rm vendor-config.toml
87
96
88
97
%build
89
98
# Build the main bootc binary
90
- %if 0%{? fedora } || 0%{? rhel } > = 10
99
+ %if % new_cargo_macros
91
100
%cargo_build %{? with_rhsm:-f rhsm}
92
101
%else
93
102
%cargo_build %{? with_rhsm:--features rhsm}
@@ -96,7 +105,7 @@ rm vendor-config.toml
96
105
# Build the system reinstallation CLI binary
97
106
%global cargo_args -p system-reinstall-bootc
98
107
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
100
109
# In cargo-rpm-macros, the cargo_build macro does flag processing,
101
110
# so we need to pass '--' to signify that cargo_args is not part
102
111
# of the macro args
You can’t perform that action at this time.
0 commit comments