diff --git a/SPECS/rpm-ostree.spec b/SPECS/rpm-ostree.spec index c0dd32c..b0453eb 100644 --- a/SPECS/rpm-ostree.spec +++ b/SPECS/rpm-ostree.spec @@ -3,10 +3,6 @@ # For RHEL > 7 we need the toolset. %if 0%{?fedora} >= 28 || 0%{?rhel} > 7 %bcond_without rust - %if 0%{?rhel} > 7 - %define rusttoolset_version rust-toolset-1.26 - %define rusttoolset scl enable %{rusttoolset_version} -- - %endif %else %bcond_with rust %endif @@ -30,18 +26,10 @@ Patch0: 0001-Backport-f50f9e8d-to-v2018.8-for-RHEL8.patch %define rust_arches x86_64 i686 armv7hl aarch64 ppc64 ppc64le s390x %endif # defined rust_arches ExclusiveArch: %{rust_arches} - %if %{defined rusttoolset_version} -BuildRequires: %{rusttoolset_version}-cargo -BuildRequires: %{rusttoolset_version}-rust -BuildRequires: %{rusttoolset_version}-runtime - %else - # This one is only in Fedora, we're not actually using it right now - # but we may in the future. - %if 0%{?fedora} >= 28 -BuildRequires: rust-packaging - %endif BuildRequires: cargo - %endif # defined rusttoolset_version +BuildRequires: rust +BuildRequires: rust-toolset +BuildRequires: cargo %endif # with_rust # For the autofiles bits below