.gitignore

@@ -1,2 +1,2 @@
-SOURCES/bootupd-0.2.19-vendor.tar.zstd
+SOURCES/bootupd-0.2.7-vendor.tar.gz
-SOURCES/bootupd-0.2.19.crate
+SOURCES/bootupd-0.2.7.crate

.rust-bootupd.metadata

@@ -1,2 +1,2 @@
-c9fc8b2e450c11c8e12fb63b7474cddd009f52e5 SOURCES/bootupd-0.2.19-vendor.tar.zstd
+517b22e10b8ea25bfae434d8ae4cfeb8bfc37baa SOURCES/bootupd-0.2.7-vendor.tar.gz
-11db1d98620000dccf43a2d645b2020b696ae321 SOURCES/bootupd-0.2.19.crate
+4105365556ce4bd93d88bf85a9b47ba970160927 SOURCES/bootupd-0.2.7.crate

SPECS/rust-bootupd.spec

@@ -1,24 +1,26 @@
 %bcond_without check
+%global __cargo_skip_build 0
 
 %global crate bootupd
 
 Name:           rust-%{crate}
-Version:        0.2.19
+Version:        0.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bootloader updater
 
-License:        Apache-2.0
+License:        ASL 2.0
-URL:            https://github.com/coreos/bootupd
+URL:            https://crates.io/crates/bootupd
-Source0:        %{url}/releases/download/v%{version}/bootupd-%{version}.crate
+Source0:        https://github.com/coreos/bootupd/releases/download/v%{version}/bootupd-%{version}.crate
-Source1:        %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
+Source1:        https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz
 
 # For now, see upstream
+ExclusiveArch:  x86_64 aarch64
 BuildRequires: make
 BuildRequires:  openssl-devel
-%if 0%{?rhel}
+%if 0%{?rhel} && !0%{?eln}
 BuildRequires: rust-toolset
 %else
-BuildRequires:  cargo-rpm-macros >= 25
+BuildRequires: rust-packaging
 %endif
 BuildRequires:  systemd
 
@@ -28,42 +30,36 @@ Bootloader updater}
 
 %package     -n %{crate}
 Summary:        %{summary}
-# Apache-2.0
+License:        ASL 2.0
-# Apache-2.0 OR BSL-1.0
-# Apache-2.0 OR MIT
-# 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)
 %{?systemd_requires}
 
 %description -n %{crate} %{_description}
 
 %files -n %{crate}
 %license LICENSE
-%license LICENSE.dependencies
-%license cargo-vendor.txt
 %doc README.md
 %{_bindir}/bootupctl
 %{_libexecdir}/bootupd
 %{_unitdir}/*
-%{_prefix}/lib/bootupd/grub2-static/
 
 %prep
-%autosetup -n %{crate}-%{version} -p1 -a1
+%autosetup -n %{crate}-%{version} -p1
-%cargo_prep -v vendor
+mkdir vendor
+tar -xv -C vendor -f %{SOURCE1}
+mkdir -p .cargo
+cat >.cargo/config << EOF
+[source.crates-io]
+replace-with = "vendored-sources"
+
+[source.vendored-sources]
+directory = "vendor"
+EOF
 
 %build
 %cargo_build
-%cargo_vendor_manifest
-%cargo_license_summary
-%{cargo_license} > LICENSE.dependencies
 
 %install
 %make_install INSTALL="install -p -c"
-%{__make} install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
 
 %post        -n %{crate}
 %systemd_post bootupd.service bootupd.socket
@@ -75,42 +71,6 @@ License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
 %systemd_postun bootupd.service bootupd.socket
 
 %changelog
-* Fri May 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.19-1
-- https://github.com/coreos/bootupd/releases/tag/v0.2.19
-  Resolves: RHEL-35887
-
-* Thu Feb 22 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.18-1
-- https://github.com/coreos/bootupd/releases/tag/v0.2.18
-  backport patch to support GRUB console.cfg
-  Resolves: RHEL-26439
-
-* Tue Dec 19 2023 Joseph Marrero <jmarrero@fedoraproject.org> - 0.2.17-1
-- https://github.com/coreos/bootupd/releases/tag/v0.2.17
-  Resolves: RHEL-14388
-
-* Fri Dec 15 2023 Huijing Hei <hhei@redhat.com> - 0.2.16-4
-- Sync spec with upstream
-  Related: https://issues.redhat.com/browse/RHEL-14388
-
-* Wed Dec 13 2023 Colin Walters <walters@verbum.org> - 0.2.16-3
-- Build on all architectures
-  Related: https://issues.redhat.com/browse/RHEL-14388
-
-* Wed Dec 13 2023 Colin Walters <walters@verbum.org> - 0.2.16-2
-- Update to 0.2.16
-  Related: https://issues.redhat.com/browse/RHEL-14388
-
-* Tue Nov 28 2023 Colin Walters <walters@verbum.org> - 0.2.15-2
-- https://github.com/coreos/bootupd/releases/tag/v0.2.15
-  Related: https://issues.redhat.com/browse/RHEL-14388
-
-* Fri Oct 20 2023 Colin Walters <walters@verbum.org> - 0.2.12-2
-- https://github.com/coreos/bootupd/releases/tag/v0.2.12
-
-* Tue Sep 19 2023 Colin Walters <walters@verbum.org> - 0.2.11-2
-- https://github.com/coreos/bootupd/releases/tag/v0.2.11
-  Resolves: https://issues.redhat.com/browse/RHEL-5273
-
 * Mon Aug 01 2022 Colin Walters <walters@verbum.org> - 0.2.7-2
 - https://github.com/coreos/bootupd/releases/tag/v0.2.7