From 384608a6711d22cd1543fb5a3a3caaaea9b3a9af Mon Sep 17 00:00:00 2001 From: "jkeating@reducto.boston.redhat.com" <> Date: Tue, 13 Feb 2007 15:43:21 -0500 Subject: [PATCH] Fix the makefile to not tag when making srpm Add things to the changelog --- Changelog | 5 +++++ Makefile | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index cf4cbbed..d1629115 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,8 @@ +* Tue Feb 13 2007 Jesse Keating +- Fix part of the patch from Essien +- Add Contributors to the Authors file +- Adjust the Makefile so that srpm doesn't cause a tag + * Mon Feb 12 2007 Jesse Keating - Add new Make targets (Essien Ita Essien) - Add runtime flags for doing specific stages of the compose (Essien Ita Essien) diff --git a/Makefile b/Makefile index 8e01e6c5..ba0a1b26 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ tag: @hg tag -m "$(HGTAG)" $(HGTAG) # @hg push -archive: tag +archive: @rm -rf ${PKGNAME}-$(VERSION)/ @python setup.py sdist > /dev/null @echo "The archive is in dist/${PKGNAME}-$(VERSION).tar.gz" @@ -27,7 +27,7 @@ srpm: archive @rpmbuild -bs ${PKGRPMFLAGS} ${PKGNAME}.spec @echo "The srpm is in $(SRPM)" -rpm: archive +rpm: archive tag @rpmbuild --clean -bb ${PKGRPMFLAGS} ${PKGNAME}.spec @echo "The rpm is in $(RPM)"