From 337a2bcc00f5717dae1dcb422f0ad6b2da09c6c8 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 1 Feb 2024 21:18:01 -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-afterburn.spec | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/rust-afterburn.spec b/rust-afterburn.spec
index b18c0da..b691fd3 100644
--- a/rust-afterburn.spec
+++ b/rust-afterburn.spec
@@ -7,7 +7,7 @@
 
 Name:           rust-afterburn
 Version:        5.5.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Simple cloud provider agent
 
 License:        Apache-2.0
@@ -62,6 +62,9 @@ License:        Apache-2.0 AND 0BSD AND BSD-3-Clause AND MIT AND (Apache-2.0 OR
 %license LICENSE
 %license NOTICE
 %license LICENSE.dependencies
+%if 0%{?rhel}
+%license cargo-vendor.txt
+%endif
 %doc README.md
 %doc code-of-conduct.md
 %{_bindir}/afterburn
@@ -104,9 +107,9 @@ to run in the initramfs on boot.
 %{dracutmodulesdir}/30afterburn/
 
 %prep
-%autosetup -n %{crate}-%{version_no_tilde} -p1
+%autosetup -n %{crate}-%{version_no_tilde} -p1 %{?rhel:-a1}
 %if 0%{?rhel}
-%cargo_prep -V 1
+%cargo_prep -v vendor
 %else
 %cargo_prep
 %endif
@@ -126,6 +129,9 @@ sed -e 's,@DEFAULT_INSTANCE@,core,' < \
 %cargo_build
 %{?cargo_license_summary}
 %{?cargo_license} > LICENSE.dependencies
+%if 0%{?rhel}
+%cargo_vendor_manifest
+%endif
 
 %install
 %if 0%{?rhel}
@@ -144,6 +150,9 @@ cp -a dracut/* %{buildroot}%{dracutmodulesdir}
 %endif
 
 %changelog
+* Fri Feb 02 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 5.5.1-3
+- Update Rust macro usage
+
 * Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.5.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild