From 9bd5d96abb81f1340141ba8b17d4b5167b03b6ae Mon Sep 17 00:00:00 2001
From: Toshio Kuratomi <a.badger@gmail.com>
Date: Tue, 12 Nov 2019 11:22:35 -0800
Subject: [PATCH] [stable-2.9] rpmfilename must be constructed using rpmmacros
 (#63025)

Different subpackages have different names so, at the least, the %NAME
macros must be used when constructing the rpmfilename.  Otherwise each
subsequent subpackage will overwrite the previous one.

This reinstates dag's fix from d4b6aecd978736f034a6a2160475f04ec2451d36

Fixes #62673
(cherry picked from commit 30cc54d)

Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7762d068980..99bbb6bd5b3 100644
--- a/Makefile
+++ b/Makefile
@@ -301,7 +301,7 @@ rpm: rpmcommon
 	--define "_srcrpmdir %{_topdir}" \
 	--define "_specdir $(RPMSPECDIR)" \
 	--define "_sourcedir %{_topdir}" \
-	--define "_rpmfilename $(RPMNVR).%%{ARCH}.rpm" \
+	--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \
 	--define "__python `which $(PYTHON)`" \
 	--define "upstream_version $(VERSION)" \
 	--define "rpmversion $(RPMVERSION)" \