External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-13 15:09:32 -02:30
Code Issues Packages Projects Releases Wiki Activity

Minor change to fix an issue with official rpm builds

Browse Source
This commit is contained in:
James Cammarata
2013-06-26 08:10:17 -04:00
parent 1a3fbcd796
commit c649aedc8b
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@@ -16,7 +16,7 @@ DEB_PKG_RELEASE=$(VERSION)-$(BUILD)
else else
BUILD= BUILD=
SDIST_TAR_FILE=awx-$(VERSION).tar.gz SDIST_TAR_FILE=awx-$(VERSION).tar.gz
RPM_PKG_RELEASE= RPM_PKG_RELEASE=$(RELEASE)
DEB_BUILD_DIR=deb-build/awx-$(VERSION) DEB_BUILD_DIR=deb-build/awx-$(VERSION)
DEB_PKG_RELEASE=$(VERSION)-$(RELEASE) DEB_PKG_RELEASE=$(VERSION)-$(RELEASE)
endif endif
@@ -137,9 +137,11 @@ sdist: clean
fi fi
rpmtar: sdist rpmtar: sdist
(cd dist/ && tar zxf $(SDIST_TAR_FILE)) if [ "$(OFFICIAL)" != "yes" ] ; then \
(cd dist/ && mv awx-$(VERSION)-$(BUILD) awx-$(VERSION)) (cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \
(cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION)) (cd dist/ && mv awx-$(VERSION)-$(BUILD) awx-$(VERSION)) ; \
(cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION)) ; \
fi
rpm: rpmtar rpm: rpmtar
@mkdir -p rpm-build @mkdir -p rpm-build
@@ -151,7 +153,7 @@ rpm: rpmtar
--define "_specdir %{_topdir}" \ --define "_specdir %{_topdir}" \
--define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \
--define "_sourcedir %{_topdir}" \ --define "_sourcedir %{_topdir}" \
--define "_pkgrelease $(BUILD)" \ --define "_pkgrelease $(RPM_PKG_RELEASE)" \
-ba packaging/rpm/awx.spec -ba packaging/rpm/awx.spec
deb: sdist deb: sdist