From 9ae1ace2af950cccca3581607dcd5419fd90ae7b Mon Sep 17 00:00:00 2001
From: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
Date: Fri, 7 Jun 2024 10:52:15 +0200
Subject: [PATCH] rpm/fedora: Update rust macro usage

Changes based on patch by Yaakov Selkowitz on Fedora

Signed-off-by: Anderson Toshiyuki Sasaki <ansasaki@redhat.com>
---
 rpm/fedora/keylime-agent-rust.spec | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/rpm/fedora/keylime-agent-rust.spec b/rpm/fedora/keylime-agent-rust.spec
index d847b436..e55dba54 100644
--- a/rpm/fedora/keylime-agent-rust.spec
+++ b/rpm/fedora/keylime-agent-rust.spec
@@ -80,19 +80,11 @@ Conflicts:      keylime-agent
 Rust agent for Keylime
 
 %prep
-%autosetup -n rust-keylime-%{version} -N
+%autosetup -n rust-keylime-%{version} -N %{?bundled_rust_deps:-a1}
 %if 0%{?bundled_rust_deps}
 %autopatch -m 100 -p1
 # Source1 contains vendored dependencies
-%cargo_prep
-tar -xoaf %{SOURCE1}
-sed -i 's/^\(replace-with\).*$/\1 = "vendored-sources"/g' .cargo/config
-cat >> .cargo/config << EOF
-
-[source.vendored-sources]
-directory = "./vendor"
-EOF
-
+%cargo_prep -v vendor
 %cargo_generate_buildrequires
 %else
 %autopatch -M 99 -p1
@@ -102,6 +94,11 @@ EOF
 
 %build
 %cargo_build -ftesting
+%cargo_license_summary
+%{cargo_license} > LICENSE.dependencies
+%if 0%{?bundled_rust_deps}
+%cargo_vendor_manifest
+%endif
 
 %install
 
@@ -149,6 +146,8 @@ chown -R keylime:keylime %{_sysconfdir}/keylime
 
 %files
 %license LICENSE
+%license LICENSE.dependencies
+%license cargo-vendor.txt
 %doc README.md
 %attr(500,keylime,keylime) %dir %{_sysconfdir}/keylime
 %attr(500,keylime,keylime) %dir %{_sysconfdir}/keylime/agent.conf.d