From c613ba12687d8576068fe4b44d52ea8a2d1fb0d1 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Thu, 1 Feb 2024 19:33:32 -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.
---
 clevis-pin-tpm2.spec | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/clevis-pin-tpm2.spec b/clevis-pin-tpm2.spec
index b42603d..4ad0b9e 100644
--- a/clevis-pin-tpm2.spec
+++ b/clevis-pin-tpm2.spec
@@ -5,7 +5,7 @@
 
 Name:           clevis-pin-tpm2
 Version:        0.5.3
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Clevis PIN for unlocking with TPM2 supporting Authorized Policies
 
 License:        MIT
@@ -31,9 +31,9 @@ Requires:       clevis
 %{summary}.
 
 %prep
-%autosetup -p1
+%autosetup -p1 %{?rhel:-a1}
 %if 0%{?rhel}
-%cargo_prep -V 1
+%cargo_prep -v vendor
 %else
 %cargo_prep
 
@@ -43,6 +43,11 @@ Requires:       clevis
 
 %build
 %cargo_build
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%if 0%{?rhel}
+%cargo_vendor_manifest
+%endif
 
 %install
 %cargo_install
@@ -56,10 +61,17 @@ ln -s /usr/bin/clevis-pin-tpm2 %{buildroot}/usr/bin/clevis-decrypt-tpm2plus
 
 %files
 %license LICENSE
+%license LICENSE.dependencies
+%if 0%{?rhel}
+%license cargo-vendor.txt
+%endif
 %{_bindir}/clevis-pin-tpm2
 %{_bindir}/clevis-*-tpm2plus
 
 %changelog
+* Fri Feb 02 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.5.3-5
+- Update Rust macro usage
+
 * Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild