diff options
| author | James Cammarata <jimi@sngx.net> | 2013-06-26 14:10:17 +0200 |
|---|---|---|
| committer | James Cammarata <jimi@sngx.net> | 2013-06-26 14:10:17 +0200 |
| commit | c649aedc8bc432cf913a3377bafea87ab79edf2c (patch) | |
| tree | 1864e198455526d85e13a02d58485895fd4704a9 | |
| parent | Change for RPM packaging to allow daily dev builds (diff) | |
| download | awx-c649aedc8bc432cf913a3377bafea87ab79edf2c.tar.xz awx-c649aedc8bc432cf913a3377bafea87ab79edf2c.zip | |
Minor change to fix an issue with official rpm builds
| -rw-r--r-- | Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
@@ -16,7 +16,7 @@ DEB_PKG_RELEASE=$(VERSION)-$(BUILD) else BUILD= SDIST_TAR_FILE=awx-$(VERSION).tar.gz -RPM_PKG_RELEASE= +RPM_PKG_RELEASE=$(RELEASE) DEB_BUILD_DIR=deb-build/awx-$(VERSION) DEB_PKG_RELEASE=$(VERSION)-$(RELEASE) endif @@ -137,9 +137,11 @@ sdist: clean fi rpmtar: sdist - (cd dist/ && tar zxf $(SDIST_TAR_FILE)) - (cd dist/ && mv awx-$(VERSION)-$(BUILD) awx-$(VERSION)) - (cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION)) + if [ "$(OFFICIAL)" != "yes" ] ; then \ + (cd dist/ && tar zxf $(SDIST_TAR_FILE)) ; \ + (cd dist/ && mv awx-$(VERSION)-$(BUILD) awx-$(VERSION)) ; \ + (cd dist/ && tar czf awx-$(VERSION).tar.gz awx-$(VERSION)) ; \ + fi rpm: rpmtar @mkdir -p rpm-build @@ -151,7 +153,7 @@ rpm: rpmtar --define "_specdir %{_topdir}" \ --define '_rpmfilename %%{NAME}-%%{VERSION}-%%{RELEASE}.%%{ARCH}.rpm' \ --define "_sourcedir %{_topdir}" \ - --define "_pkgrelease $(BUILD)" \ + --define "_pkgrelease $(RPM_PKG_RELEASE)" \ -ba packaging/rpm/awx.spec deb: sdist |