diff --git a/.hgtags b/.hgtags index 5ef19109..7efcb841 100644 --- a/.hgtags +++ b/.hgtags @@ -15,3 +15,7 @@ ebfe0e963db6d7b652f63f99aaec121e7ff19074 pungi-0.2.1-1 769a8e08d77a2234295449282b16ca38ff4d846e pungi-0.2.2-1 ba049c3454d5dae9326d8050bb0d7d8116982ca4 f7-test1 780520383876b76dd06fa013e1a41ddd6bf0901e pungi-0.2.3-1 +158bd9a170892b43645caed12bddc3602ef3be4d pungi-0.2.3-1 +6659955ccfdf29ecd6027bd3770f80d815720af0 pungi-0.2.3-1 +9f7b5877c32c533d00ea6baa67057ce424a40a61 pungi-0.2.3-1 +7ea08753383766ce36bb49fef6d4fcf44158ad26 pungi-0.2.3-1 diff --git a/Authors b/Authors index 3a2217fb..5aad5f54 100644 --- a/Authors +++ b/Authors @@ -1 +1,8 @@ +Authors: + Jesse Keating + +Contributors: + +Will Woods +sien Ita Essien 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)" diff --git a/pungi b/pungi index c2c547db..da335d49 100755 --- a/pungi +++ b/pungi @@ -114,7 +114,7 @@ def main(): mypungi.doSplittree() if opts.do_all or opts.do_createiso: mypungi.doCreateSplitrepo() - mypungi.doCreateIsos(config.get('default', 'iso_dir')) + mypungi.doCreateIsos() # Do things slightly different for src. if config.get('default', 'arch') == 'source':