cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Push another fix to the Makefile for building 1.9 rpm as ansible1.9

Browse source
This commit is contained in:
Toshio Kuratomi 2016-05-04 11:13:51 -07:00
parent 8394c02781
commit 7ffc44522f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -80,7 +80,7 @@ RPMRELEASE = $(RELEASE)
ifneq ($(OFFICIAL),yes) ifneq ($(OFFICIAL),yes)
RPMRELEASE = 0.git$(DATE) RPMRELEASE = 0.git$(DATE)
endif endif
RPMNVR = "$(NAME)-$(VERSION)-$(RPMRELEASE)$(RPMDIST)" RPMNVR = "$(NAME)1.9-$(VERSION)-$(RPMRELEASE)$(RPMDIST)"
# MOCK build parameters # MOCK build parameters
MOCK_BIN ?= mock MOCK_BIN ?= mock
@ -171,7 +171,7 @@ mock-srpm: /etc/mock/$(MOCK_CFG).cfg rpmcommon
@echo "#############################################" @echo "#############################################"
mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm mock-rpm: /etc/mock/$(MOCK_CFG).cfg mock-srpm
$(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/ --rebuild rpm-build/$(NAME)-*.src.rpm $(MOCK_BIN) -r $(MOCK_CFG) --resultdir rpm-build/ --rebuild rpm-build/$(RPMNVR)-*.src.rpm
@echo "#############################################" @echo "#############################################"
@echo "Ansible RPM is built:" @echo "Ansible RPM is built:"
@echo rpm-build/*.noarch.rpm @echo rpm-build/*.noarch.rpm
@ -198,7 +198,7 @@ rpm: rpmcommon
--define "_srcrpmdir %{_topdir}" \ --define "_srcrpmdir %{_topdir}" \
--define "_specdir $(RPMSPECDIR)" \ --define "_specdir $(RPMSPECDIR)" \
--define "_sourcedir %{_topdir}" \ --define "_sourcedir %{_topdir}" \
--define "_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm" \ --define "_rpmfilename $(RPMNVR).%%{ARCH}.rpm" \
--define "__python `which $(PYTHON)`" \ --define "__python `which $(PYTHON)`" \
-ba rpm-build/$(NAME).spec -ba rpm-build/$(NAME).spec
@rm -f rpm-build/$(NAME).spec @rm -f rpm-build/$(NAME).spec