diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2019-11-12 11:22:35 -0800 |
|---|---|---|
| committer | Matt Davis <nitzmahone@users.noreply.github.com> | 2019-11-12 11:22:35 -0800 |
| commit | 9bd5d96abb81f1340141ba8b17d4b5167b03b6ae (patch) | |
| tree | 2f66017eae0b6342e5bca52b6d7d7e37d26ca6a0 /Makefile | |
| parent | 73f42d22ffd52611876017df59940fb08cf04192 (diff) | |
| download | ansible-9bd5d96abb81f1340141ba8b17d4b5167b03b6ae.tar.gz | |
[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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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)" \ |