diff --git a/Changelog b/Changelog index 3b6e1d43..207c14e1 100644 --- a/Changelog +++ b/Changelog @@ -1,3 +1,6 @@ +* Mon Feb 12 2007 Jesse Keating +- Add new Make targets (Essien Ita Essien) + * Thu Feb 08 2007 Jesse Keating - Add support for globbing in manifest diff --git a/Makefile b/Makefile index 9fce8410..8e01e6c5 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,11 @@ PKGNAME=pungi VERSION=$(shell rpm -q --qf "%{VERSION}\n" --specfile ${PKGNAME}.spec) RELEASE=$(shell rpm -q --qf "%{RELEASE}\n" --specfile ${PKGNAME}.spec) HGTAG=${PKGNAME}-$(VERSION)-$(RELEASE) -PKGRPMFLAGS=--define "_topdir ${PWD}" --define "_specdir ${PWD}" --define "_sourcedir ${PWD}/dist" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" +PKGRPMFLAGS=--define "_topdir ${PWD}" --define "_specdir ${PWD}" --define "_sourcedir ${PWD}/dist" --define "_srcrpmdir ${PWD}" --define "_rpmdir ${PWD}" --define "_builddir ${PWD}" + +RPM="noarch/${PKGNAME}-$(VERSION)-$(RELEASE).noarch.rpm" +SRPM="${PKGNAME}-$(VERSION)-$(RELEASE).src.rpm" + default: all @@ -19,7 +23,20 @@ archive: tag @echo "The archive is in dist/${PKGNAME}-$(VERSION).tar.gz" srpm: archive - @rm -f ${PKGNAME}-$(VERSION)-$(RELEASE).src.rpm + @rm -f $(SRPM) @rpmbuild -bs ${PKGRPMFLAGS} ${PKGNAME}.spec - @echo "The srpm is in ${PKGNAME}-$(VERSION)-$(RELEASE).src.rpm" + @echo "The srpm is in $(SRPM)" +rpm: archive + @rpmbuild --clean -bb ${PKGRPMFLAGS} ${PKGNAME}.spec + @echo "The rpm is in $(RPM)" + +rpminstall: rpm + @rpm -ivh --force $(RPM) + +clean: + @rm -f *.rpm + @rm -rf noarch + @rm -f *.tar.gz + @rm -rf dist + @rm -f MANIFEST