Ovirt devel - Nov 2008 - [PATCH node-image] Change to build RPM w/ supplied ISO, but SRPM w/o ISO

This way we don't distribute the SRPM w/ the ISO embedded in it,
only the RPM contains that.

Signed-off-by: Perry Myers <pmyers at redhat.com>
---
 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 61f826f..b5d732d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -60,11 +60,10 @@ _ovirt_dev = \
    $(srcdir)/*.spec.in && echo 1 || :)
 
 git_head	= $$(git log -1 --pretty=format:%h)
-GIT_RELEASE	= $$(date --utc +%Y%m%d%H%M%S)git$(git_head)
+GIT_RELEASE	= $(shell date --utc +%Y%m%d%H%M%S)git$(git_head)
 RPMDIR		= $$(rpm --eval '%{_rpmdir}')
 RPM_FLAGS	= --define "ovirt_cache_dir $(OVIRT_CACHE_DIR)"
 RPM_FLAGS	+= $(if $(_ovirt_dev),--define "extra_release
.$(GIT_RELEASE)")
-RPM_FLAGS	+= --define "source_iso 1"
 
 repos.ks:
 	( \
@@ -126,7 +125,8 @@ $(NVR).$(PKG_FMT).$(SUM): $(NVR).$(PKG_FMT)
 $(PACKAGE).$(PKG_FMT) node: $(NVR).$(PKG_FMT).$(SUM)
 
 rpms: dist node
-	rpmbuild $(RPM_FLAGS) -ta $(distdir).tar.gz
+	rpmbuild $(RPM_FLAGS) --define "source_iso 1" -ta $(distdir).tar.gz
+	rpmbuild $(RPM_FLAGS) -ts $(distdir).tar.gz
 
 publish: rpms
 	mkdir -p $(OVIRT_CACHE_DIR)
-- 
1.6.0.3

Perry Myers wrote:
> This way we don't distribute the SRPM w/ the ISO embedded in it,
> only the RPM contains that.
ACK, pushed with a minor optimization:
 
> +	rpmbuild $(RPM_FLAGS) --define "source_iso 1" -ta
$(distdir).tar.gz
-ta -> -tb to build SRPM only once
> +	rpmbuild $(RPM_FLAGS) -ts $(distdir).tar.gz