[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 d4b6aecd97

Fixes #62673
(cherry picked from commit 30cc54d)

Co-authored-by: Toshio Kuratomi <a.badger@gmail.com>
pull/64756/head
Toshio Kuratomi 5 years ago committed by Matt Davis
parent 73f42d22ff
commit 9bd5d96abb

@ -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)" \

Loading…
Cancel
Save