From 1182f8f185d4a27faf0539a4d1f572be2260f06d Mon Sep 17 00:00:00 2001 From: Christian Heimes Date: Thu, 11 Feb 2021 15:31:54 +0100 Subject: [PATCH] Fix RHEL build: remove wheel build requirements, use rust-toolset --- python-setuptools-rust.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/python-setuptools-rust.spec b/python-setuptools-rust.spec index 8918e8a..0f997a5 100644 --- a/python-setuptools-rust.spec +++ b/python-setuptools-rust.spec @@ -1,6 +1,6 @@ Name: python-setuptools-rust Version: 0.11.6 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Setuptools Rust extension plugin License: MIT @@ -13,12 +13,13 @@ BuildRequires: python3-devel BuildRequires: python3dist(setuptools) BuildRequires: python3dist(semantic-version) >= 2.6 BuildRequires: python3dist(toml) >= 0.9.0 -BuildRequires: python3dist(wheel) %if 0%{?fedora} BuildRequires: python3dist(setuptools-scm) >= 3.4.3 -BuildRequires: rust-packaging +BuildRequires: python3dist(wheel) +BuildRequires: rust-packaging >= 1.45 %else -BuildRequires: rust-toolset +# RHEL has rust-toolset and neither setuptools-scm nor wheel +BuildRequires: rust-toolset >= 1.45 %endif %description @@ -27,7 +28,11 @@ extensions written in Rust as easily as if they were written in C. %package -n python3-setuptools-rust Summary: %{summary} -Requires: rust-packaging +%if 0%{?fedora} +Requires: rust-packaging >= 1.45 +%else +Requires: rust-toolset >= 1.45 +%endif %description -n python3-setuptools-rust Setuptools helpers for Rust Python extensions. Compile and distribute Python @@ -69,6 +74,9 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} \ %{python3_sitelib}/setuptools_rust-%{version}-py%{python3_version}.egg-info/ %changelog +* Thu Feb 11 2021 Christian Heimes - 0.11.6-4 +- Fix RHEL build: remove wheel build requirements, use rust-toolset + * Thu Feb 11 2021 Christian Heimes - 0.11.6-3 - Add RHEL packaging support