From 8b7ad9eaa72cdf85fa65e4aab0ec35099614be3f Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 1 Feb 2024 14:32:46 -0500
Subject: [PATCH] Update Rust macro usage

The rust-toolset macros in RHEL 10 are now compatible with Fedora's
in terms of handling vendoring and automatic generation of license
information and bundled provides.
---
 rust-bootupd.spec | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/rust-bootupd.spec b/rust-bootupd.spec
index 53c310f..ccfc984 100644
--- a/rust-bootupd.spec
+++ b/rust-bootupd.spec
@@ -4,7 +4,7 @@
 
 Name:           rust-%{crate}
 Version:        0.2.17
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Bootloader updater
 
 License:        Apache-2.0
@@ -43,10 +43,8 @@ License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
 
 %files -n %{crate}
 %license LICENSE
-%if !0%{?rhel}
 %license LICENSE.dependencies
 %license cargo-vendor.txt
-%endif
 %doc README.md
 %{_bindir}/bootupctl
 %{_libexecdir}/bootupd
@@ -54,20 +52,14 @@ License:        Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
 %{_prefix}/lib/bootupd/grub2-static/
 
 %prep
-%autosetup -n %{crate}-%{version} -p1 %{!?rhel:-a1}
-%if 0%{?rhel}
-%cargo_prep -V 1
-%else
+%autosetup -n %{crate}-%{version} -p1 -a1
 %cargo_prep -v vendor
-%endif
 
 %build
 %cargo_build
-%if !0%{?rhel}
 %cargo_vendor_manifest
 %cargo_license_summary
 %{cargo_license} > LICENSE.dependencies
-%endif
 
 %install
 %make_install INSTALL="install -p -c"
@@ -83,6 +75,9 @@ 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
+* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.2.17-4
+- Update Rust macro usage
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.2.17-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild