From 66dcca9b77765474ecd9cf4c286d59b29ab24c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
Date: Tue, 22 Feb 2022 11:47:30 +0100
Subject: [PATCH] Use the new way to set debuginfo level during build

---
 keylime-agent-rust.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/keylime-agent-rust.spec b/keylime-agent-rust.spec
index a1c19b4..c9b0931 100644
--- a/keylime-agent-rust.spec
+++ b/keylime-agent-rust.spec
@@ -22,6 +22,11 @@
 %global bundled_rust_deps 0
 %endif
 
+%ifarch armv7hl
+# drop debuginfo generation for armv7hl OOM problems
+%global rustflags_debuginfo 0
+%endif
+
 Name:           keylime-agent-rust
 Version:        %{crate_version}~%{commitdate}git%{shortcommit}
 Release:        1%{?dist}
@@ -65,7 +70,7 @@ BuildRequires:  openssl-devel
 BuildRequires:  libarchive-devel
 BuildRequires:  tpm2-tss-devel
 %else
-BuildRequires:  rust-packaging
+BuildRequires:  rust-packaging >= 21-2
 %endif
 
 # Virtual Provides to support swapping between Python and Rust implementation
@@ -89,10 +94,6 @@ Rust agent for Keylime
 %else
 %cargo_prep
 %endif
-%ifarch armv7hl
-# drop debuginfo generation for armv7hl OOM problems
-sed -i "s/debuginfo=2/debuginfo=0/" .cargo/config
-%endif
 
 %if !0%{?bundled_rust_deps}
 %generate_buildrequires