From b3ea9f2461b9476ac731f0cf6843796791ccf2ac Mon Sep 17 00:00:00 2001
From: Jesus Checa Hidalgo <jchecahi@redhat.com>
Date: Fri, 14 Jun 2024 11:25:17 +0200
Subject: [PATCH] rust-rpmmacros: Make test compatible with rpm 4.20+

---
 tests/Sanity/rust-rpmmacros/runtest.sh        | 8 +++-----
 tests/Sanity/rust-rpmmacros/rust-rpmtest.spec | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/Sanity/rust-rpmmacros/runtest.sh b/tests/Sanity/rust-rpmmacros/runtest.sh
index 220d877..bfca5d4 100755
--- a/tests/Sanity/rust-rpmmacros/runtest.sh
+++ b/tests/Sanity/rust-rpmmacros/runtest.sh
@@ -4,9 +4,9 @@
 
 PACKAGES="rust cargo"
 if rlIsFedora; then
-  PACKAGES+=" cargo-rpm-macros"
+    PACKAGES+=" cargo-rpm-macros"
 else
-  PACKAGES+=" rust-toolset"
+    PACKAGES+=" rust-toolset"
 fi
 SPECFILE="rust-rpmtest.spec"
 PKGNAME="$(rpmspec -q --srpm --qf "%{name}-%{version}-%{release}.%{arch}" $SPECFILE)"
@@ -31,14 +31,12 @@ rlJournalStart
 
         # Set the spec file
         rlRun "cp $SPECFILE $tmp/SPECS"
-        rlRun "cp rust-rpmtest.spec $tmp/SPECS"
         rlRun "pushd $tmp"
         rlRun "set -o pipefail"
     rlPhaseEnd
 
     rlPhaseStartTest
-        rlRun "rpmbuild --define '_topdir $tmp' -bi $tmp/SPECS/$SPECFILE"
-        rlRun "$tmp/BUILDROOT/$PKGNAME/usr/bin/rpmtest"
+        rlRun "rpmbuild --define '_topdir $tmp' -ba $tmp/SPECS/$SPECFILE"
     rlPhaseEnd
 
     rlPhaseStartCleanup
diff --git a/tests/Sanity/rust-rpmmacros/rust-rpmtest.spec b/tests/Sanity/rust-rpmmacros/rust-rpmtest.spec
index d8c43f2..abe8c12 100644
--- a/tests/Sanity/rust-rpmmacros/rust-rpmtest.spec
+++ b/tests/Sanity/rust-rpmmacros/rust-rpmtest.spec
@@ -48,3 +48,4 @@ Summary:        %{summary}
 
 %check
 %cargo_test
+%{buildroot}/%{_bindir}/rpmtest | grep -E "The answer is [0-9]+"