From 84fd47f0a399d912932372e60b07c30125b3aabe Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Mon, 2 Nov 2020 23:26:01 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/rust-bootupd.git#c6cf7f6492e0d943e8471f86719df89eed587f6a --- .gitignore | 1 + rust-bootupd.spec | 21 +++++++++++++++------ sources | 1 + 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4c04025..2412dd1 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /bootupd-0.1.2.crate /bootupd-0.1.3.crate /bootupd-0.2.0.crate +/bootupd-0.2.0-vendor.tar.gz diff --git a/rust-bootupd.spec b/rust-bootupd.spec index a061d22..ab1ce06 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -5,12 +5,13 @@ Name: rust-%{crate} Version: 0.2.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootloader updater License: ASL 2.0 URL: https://crates.io/crates/bootupd -Source: %{crates_source} +Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz # For now, see upstream ExclusiveArch: x86_64 aarch64 @@ -41,11 +42,16 @@ License: ASL 2.0 %{_unitdir}/* %prep -%autosetup -n %{crate}-%{version_no_tilde} -p1 -%cargo_prep +%autosetup -n %{crate}-%{version} -p1 +tar xvf %{SOURCE1} +mkdir -p .cargo +cat >.cargo/config << EOF +[source.crates-io] +replace-with = "vendored-sources" -%generate_buildrequires -%cargo_generate_buildrequires +[source.vendored-sources] +directory = "vendor" +EOF %build %cargo_build @@ -63,6 +69,9 @@ License: ASL 2.0 %systemd_postun bootupd.service bootupd.socket %changelog +* Mon Nov 2 23:03:03 UTC 2020 Colin Walters - 0.2.0-3 +- Switch to vendored sources since RHEL requires it + * Mon Oct 26 15:06:37 UTC 2020 Colin Walters - 0.2.0-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.0 diff --git a/sources b/sources index 802f9f9..d68841d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (bootupd-0.2.0-vendor.tar.gz) = fa68f25f8365a4360cb9b3b4d1105283bf0df968011e7379b9f3bc79364373f22144c4a08e858248f8dc828b7e5dd1c1a7dc0dcdba062fb6967d446251969692 SHA512 (bootupd-0.2.0.crate) = 78fdf2ccaf467b0a4d5a45eb7737951cfa44132b6d9205339931bc8d6ec81ca6956c31d4974afc05a0749602688973e33f66c50b72732026766d637c26aef061