diff options
| author | Toshio Kuratomi <a.badger@gmail.com> | 2019-10-01 10:11:24 -0700 |
|---|---|---|
| committer | Toshio Kuratomi <a.badger@gmail.com> | 2019-10-01 10:29:40 -0700 |
| commit | 30cc54da8cc4efd7a554df964b0f7bddfde0c9c4 (patch) | |
| tree | da318ef4d339139623adf8ec96c5113f7154e24c /Makefile | |
| parent | ada02f1966efa1957587bd9d763a5c86fdb19602 (diff) | |
| download | ansible-30cc54da8cc4efd7a554df964b0f7bddfde0c9c4.tar.gz | |
rpmfilename must be constructed using rpmmacros
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
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)" \ |