Merge branch 'devel' of git://github.com/dirtyharrycallahan/ansible into rpm_change

This commit is contained in:
Michael DeHaan 2013-06-03 11:48:00 -04:00
commit 57f4e808a0

View file

@ -52,7 +52,7 @@ endif
# RPM build parameters # RPM build parameters
RPMSPECDIR= packaging/rpm RPMSPECDIR= packaging/rpm
RPMSPEC = $(RPMSPECDIR)/ansible.spec RPMSPEC = $(RPMSPECDIR)/ansible.spec
RPMDIST = $(shell rpm --eval '%dist') RPMDIST = $(shell rpm --eval '%{?dist}')
RPMRELEASE = 1 RPMRELEASE = 1
ifeq ($(OFFICIAL),) ifeq ($(OFFICIAL),)
RPMRELEASE = 0.git$(DATE) RPMRELEASE = 0.git$(DATE)