mirror of
https://github.com/ansible-collections/community.general.git
synced 2024-09-14 20:13:21 +02:00
Finish up moving spec file
This commit is contained in:
parent
0a70106b0f
commit
66f294d5c1
1 changed files with 8 additions and 6 deletions
14
Makefile
14
Makefile
|
@ -10,8 +10,10 @@ MANPAGES := docs/man/man1/ansible.1 docs/man/man1/ansible-playbook.1
|
||||||
SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
|
SITELIB = $(shell python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")
|
||||||
VERSION := $(shell cat VERSION)
|
VERSION := $(shell cat VERSION)
|
||||||
# These are for building the RPM.
|
# These are for building the RPM.
|
||||||
RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < ansible.spec | cut -d "%" -f1)
|
RPMSPECDIR= packaging/rpm
|
||||||
RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < ansible.spec | cut -d "%" -f1)
|
RPMSPEC = $(RPMSPECDIR)/ansible.spec
|
||||||
|
RPMVERSION := $(shell awk '/Version/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1)
|
||||||
|
RPMRELEASE := $(shell awk '/Release/{print $$2; exit}' < $(RPMSPEC) | cut -d "%" -f1)
|
||||||
RPMDIST = $(shell rpm --eval '%dist')
|
RPMDIST = $(shell rpm --eval '%dist')
|
||||||
RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)"
|
RPMNVR = "$(NAME)-$(RPMVERSION)-$(RPMRELEASE)$(RPMDIST)"
|
||||||
|
|
||||||
|
@ -82,9 +84,9 @@ srpm: rpmcommon
|
||||||
--define "_builddir %{_topdir}" \
|
--define "_builddir %{_topdir}" \
|
||||||
--define "_rpmdir %{_topdir}" \
|
--define "_rpmdir %{_topdir}" \
|
||||||
--define "_srcrpmdir %{_topdir}" \
|
--define "_srcrpmdir %{_topdir}" \
|
||||||
--define "_specdir %{_topdir}" \
|
--define "_specdir $(RPMSPECDIR)" \
|
||||||
--define "_sourcedir %{_topdir}" \
|
--define "_sourcedir %{_topdir}" \
|
||||||
-bs ansible.spec
|
-bs $(RPMSPEC)
|
||||||
@echo "#############################################"
|
@echo "#############################################"
|
||||||
@echo "Ansible SRPM is built:"
|
@echo "Ansible SRPM is built:"
|
||||||
@echo " rpm-build/$(RPMNVR).src.rpm"
|
@echo " rpm-build/$(RPMNVR).src.rpm"
|
||||||
|
@ -95,9 +97,9 @@ rpm: rpmcommon
|
||||||
--define "_builddir %{_topdir}" \
|
--define "_builddir %{_topdir}" \
|
||||||
--define "_rpmdir %{_topdir}" \
|
--define "_rpmdir %{_topdir}" \
|
||||||
--define "_srcrpmdir %{_topdir}" \
|
--define "_srcrpmdir %{_topdir}" \
|
||||||
--define "_specdir %{_topdir}" \
|
--define "_specdir $(RPMSPECDIR)" \
|
||||||
--define "_sourcedir %{_topdir}" \
|
--define "_sourcedir %{_topdir}" \
|
||||||
-ba ansible.spec
|
-ba $(RPMSPEC)
|
||||||
@echo "#############################################"
|
@echo "#############################################"
|
||||||
@echo "Ansible RPM is built:"
|
@echo "Ansible RPM is built:"
|
||||||
@echo " rpm-build/noarch/$(RPMNVR).noarch.rpm"
|
@echo " rpm-build/noarch/$(RPMNVR).noarch.rpm"
|
||||||
|
|
Loading…
Reference in a new issue