From c9f2674e9c8848853fba013d62e39afdbe0e1f36 Mon Sep 17 00:00:00 2001
From: Holger Obermaier <40787752+ho-ob@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:08:22 +0100
Subject: [PATCH] Get full name from spec file

---
 Makefile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 5537c54..c06df8a 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,8 @@ RPM: scripts/cc-metric-collector.spec
 	@VERS=$$(git describe --tags)
 	@VERS=$${VERS#v}
 	@VERS=$${VERS//-/_}
-	@PREFIX=$$(rpmspec --query --queryformat "%{name}-%{version}" --define="VERS $${VERS}" "$${SPECFILE}")
+	@eval $$(rpmspec --query --queryformat "NAME='%{name}' VERSION='%{version}' RELEASE='%{release}' NVR='%{NVR}' NVRA='%{NVRA}'" --define="VERS $${VERS}" "$${SPECFILE}")
+	@PREFIX="$${NAME}-$${VERSION}"
 	@FORMAT="tar.gz"
 	@SRCFILE="$${SOURCEDIR}/$${PREFIX}.$${FORMAT}"
 	@git archive --verbose --format "$${FORMAT}" --prefix="$${PREFIX}/" --output="$${SRCFILE}" HEAD
@@ -77,10 +78,10 @@ RPM: scripts/cc-metric-collector.spec
 	@rpmbuild -ba --define="VERS $${VERS}" --rmsource --clean "$${SPECFILE}"
 	# Report RPMs and SRPMs when in GitHub Workflow
 	@if [[ "$${GITHUB_ACTIONS}" == true ]]; then
-	@     RPMFILES="$${RPMDIR}"/*/*.rpm
-	@     SRPMFILES="$${SRPMDIR}"/*.src.rpm
-	@     echo "RPMs: $${RPMFILES}"
-	@     echo "SRPMs: $${SRPMFILES}"
-	@     echo "::set-output name=SRPM::$${SRPMFILES}"
-	@     echo "::set-output name=RPM::$${RPMFILES}"
+	@     RPMFILE="$${RPMDIR}/$${ARCH}/$${NVRA}.rpm"
+	@     SRPMFILE="$${SRPMDIR}/$${NVR}.src.rpm"
+	@     echo "RPM: $${RPMFILE}"
+	@     echo "SRPM: $${SRPMFILE}"
+	@     echo "::set-output name=SRPM::$${SRPMFILE}"
+	@     echo "::set-output name=RPM::$${RPMFILE}"
 	@fi