rpms/bootc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix build with rust-toolset

Browse Source 
RHEL/ELN rust-toolset is currently disparate from Fedora rust-packaging.
While we are working on bringing them in sync, right now we need to
handle the current state so that this builds.
This commit is contained in:
Yaakov Selkowitz 2023-11-08 11:04:42 -05:00
parent eadfb3fbf7
commit f5d29ff516
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bootc.spec
View File

@ -21,7 +21,7 @@ Source1: %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar
BuildRequires: make BuildRequires: make
BuildRequires: ostree-devel BuildRequires: ostree-devel
BuildRequires: openssl-devel BuildRequires: openssl-devel
%if 0%{?rhel} && !0%{?eln} %if 0%{?rhel}
BuildRequires: rust-toolset BuildRequires: rust-toolset
%else %else
BuildRequires: cargo-rpm-macros >= 25 BuildRequires: cargo-rpm-macros >= 25
@ -38,13 +38,19 @@ Recommends: bootupd
%prep %prep
%autosetup -p1 -a1 %autosetup -p1 -a1
%if 0%{?rhel}
%cargo_prep -V 1
%else
%cargo_prep -v vendor %cargo_prep -v vendor
%endif
%build %build
%cargo_build %cargo_build
%if !0%{?rhel}
%cargo_vendor_manifest %cargo_vendor_manifest
%cargo_license_summary %cargo_license_summary
%{cargo_license} > LICENSE.dependencies %{cargo_license} > LICENSE.dependencies
%endif
%install %install
%make_install INSTALL="install -p -c" %make_install INSTALL="install -p -c"
@ -57,8 +63,10 @@ Recommends: bootupd
%files %files
%license LICENSE-MIT %license LICENSE-MIT
%license LICENSE-APACHE %license LICENSE-APACHE
%if !0%{?rhel}
%license LICENSE.dependencies %license LICENSE.dependencies
%license cargo-vendor.txt %license cargo-vendor.txt
%endif
%doc README.md %doc README.md
%{_bindir}/bootc %{_bindir}/bootc
%{_prefix}/lib/bootc/ %{_prefix}/lib/bootc/