From 59b974b5ca7a4297c01ff8c5ff83754b262cfe77 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 12 Feb 2025 11:05:44 -0500 Subject: [PATCH] Update to 0.2.27 Resolves: #RHEL-77728 --- .gitignore | 2 ++ rust-bootupd.spec | 20 +++++++++++++++----- sources | 4 ++-- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index acf9156..16c67bd 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,5 @@ /bootupd-0.2.19.crate /bootupd-0.2.25.crate /bootupd-0.2.25-vendor.tar.zstd +/bootupd-0.2.27.tar.zstd +/bootupd-0.2.27-vendor.tar.zstd diff --git a/rust-bootupd.spec b/rust-bootupd.spec index b9ac91e..b25171c 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -3,14 +3,15 @@ %global crate bootupd Name: rust-%{crate} -Version: 0.2.25 +Version: 0.2.27 Release: %autorelease Summary: Bootloader updater License: Apache-2.0 URL: https://github.com/coreos/bootupd -Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate +Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.tar.zstd Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd +ExcludeArch: %{ix86} # For now, see upstream BuildRequires: make @@ -31,12 +32,13 @@ Summary: %{summary} # Apache-2.0 # Apache-2.0 OR BSL-1.0 # Apache-2.0 OR MIT +# Apache-2.0 WITH LLVM-exception # Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT # BSD-3-Clause # MIT # MIT OR Apache-2.0 # Unlicense OR MIT -License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) +License: Apache-2.0 AND (Apache-2.0 WITH LLVM-exception) AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT) %{?systemd_requires} %description -n %{crate} %{_description} @@ -49,20 +51,28 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %{_bindir}/bootupctl %{_libexecdir}/bootupd %{_prefix}/lib/bootupd/grub2-static/ +%{_unitdir}/bootloader-update.service %prep -%autosetup -n %{crate}-%{version} -p1 -a1 -%cargo_prep -v vendor +%autosetup -n %{crate}-%{version} -p1 -Sgit -a1 +# 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 %install %make_install INSTALL="install -p -c" %{__make} install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p" +%{__make} install-systemd-unit DESTDIR=%{?buildroot} INSTALL="%{__install} -p" %changelog %autochangelog diff --git a/sources b/sources index f0ed6f3..fb5ceb4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootupd-0.2.25.crate) = a094407f6e1392865cf62d0b361a1f508d979eb7b3ac2709ee319cc118f23e9af3a1dff8d89b138b58e9816d2e7d292805ca2df4814a55711b0ccbbc91f5800e -SHA512 (bootupd-0.2.25-vendor.tar.zstd) = 48cd53ed0a260eb821d06a663cca21275041c750d8781d9eea80ec109a96449cd7a72db4c995958a81c065554014ef9e1ea8610d047b0614c8cb0bfb0fdfa1c2 +SHA512 (bootupd-0.2.27.tar.zstd) = 2aabcf656707289dfade59824865de9b6341dfbb009336adf56f9c2b2ed74a8f6712c824295ef0dcb9beb49e1edc28b6237d11fc95abf8091490fe2ef53cc567 +SHA512 (bootupd-0.2.27-vendor.tar.zstd) = 91e49a62b4c763689bb3c6b2b28999a78b6d04376b0f3885de6be51b6ffeb987399a2500a1bdb2f459539fccc2de3bf028568a6eab0a89e3ae1463dfb2be08f7