From a1a293f7f1072632d7f9032080b537aee62193aa Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Tue, 11 Feb 2025 14:36:49 -0500 Subject: [PATCH] contrib/rpm: Sync vendor config from bootc --- contrib/packaging/bootupd.spec | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/contrib/packaging/bootupd.spec b/contrib/packaging/bootupd.spec index 6bdae6e1..3d205dca 100644 --- a/contrib/packaging/bootupd.spec +++ b/contrib/packaging/bootupd.spec @@ -55,19 +55,17 @@ License: Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND BSD-3-Clause %prep %autosetup -n %{crate}-%{version} -p1 -Sgit -tar -xv -f %{SOURCE1} -mkdir -p .cargo -cat >.cargo/config << EOF -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +# Default -v vendor config doesn't support non-crates.io deps (i.e. git) +cp .cargo/vendor-config.toml . +%cargo_prep -N +cat vendor-config.toml >> .cargo/config.toml +rm vendor-config.toml %build %cargo_build %cargo_vendor_manifest +# https://pagure.io/fedora-rust/rust-packaging/issue/33 +sed -i -e '/https:\/\//d' cargo-vendor.txt %cargo_license_summary %{cargo_license} > LICENSE.dependencies