Use rust-toolset in RHEL builds
RHEL provides a minimal set of macros compared to Fedora.
This commit is contained in:
parent
db577ef350
commit
ee730faf27
@ -10,7 +10,7 @@
|
|||||||
Summary: Device-mapper Persistent Data Tools
|
Summary: Device-mapper Persistent Data Tools
|
||||||
Name: device-mapper-persistent-data
|
Name: device-mapper-persistent-data
|
||||||
Version: 1.0.4
|
Version: 1.0.4
|
||||||
Release: 1%{?dist}%{?release_suffix}
|
Release: 2%{?dist}%{?release_suffix}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
#ExcludeArch: %%{ix86}
|
#ExcludeArch: %%{ix86}
|
||||||
URL: https://github.com/jthornber/thin-provisioning-tools
|
URL: https://github.com/jthornber/thin-provisioning-tools
|
||||||
@ -19,9 +19,13 @@ Source0: https://github.com/jthornber/thin-provisioning-tools/archive/v%{version
|
|||||||
Source1: dmpd104-vendor.tar.gz
|
Source1: dmpd104-vendor.tar.gz
|
||||||
Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
|
Patch1: 0001-Tweak-cargo.toml-to-work-with-vendor-directory.patch
|
||||||
|
|
||||||
|
%if %{defined rhel}
|
||||||
|
BuildRequires: rust-toolset
|
||||||
|
%else
|
||||||
BuildRequires: rust-packaging
|
BuildRequires: rust-packaging
|
||||||
BuildRequires: rust >= 1.35
|
BuildRequires: rust >= 1.35
|
||||||
BuildRequires: cargo
|
BuildRequires: cargo
|
||||||
|
%endif
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
# FIXME: Remove this!
|
# FIXME: Remove this!
|
||||||
BuildRequires: rust-gdb
|
BuildRequires: rust-gdb
|
||||||
@ -114,6 +118,9 @@ make DESTDIR=%{buildroot} MANDIR=%{_mandir} install
|
|||||||
#% {_sbindir}/thin_show_duplicates
|
#% {_sbindir}/thin_show_duplicates
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue May 30 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 1.0.4-2
|
||||||
|
- Use rust-toolset in RHEL builds
|
||||||
|
|
||||||
* Fri Apr 28 2023 Marian Csontos <mcsontos@redhat.com> - 1.0.4-1
|
* Fri Apr 28 2023 Marian Csontos <mcsontos@redhat.com> - 1.0.4-1
|
||||||
- Update to latest upstream release 1.0.4.
|
- Update to latest upstream release 1.0.4.
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user