Overwrite contents of VERSION file from the HEAD revision with the current version (at the time of building), so VERSION file in the tarball generated by "make dist" (and which follows also rpm package generated by "make rpm") is up to date. Otherwise for example when building rpm it will be compiled with wrong version string. Signed-off-by: Jakub Narebski <jnareb@xxxxxxxxx> --- On Thu, 31 May 2007, Jonas Fonseca wrote: > Maybe you can test the newly released tig 0.7 tarball? > > Your patch was added as commit 8cdf56913e7e486bb3f527c24ee4a4d19f2a4f61, > with a few minor adjustments. One of those changes was using HEAD version of VERSION file in "make dist", instead of regenerating it and replacing it with the one containing _current_ version in the tar file. $ make rpm sed -e 's/@@VERSION@@/0.7.4.g1995120/g' < tig.spec.in > tig.spec git-archive --format=tar --prefix=tig-0.7.4.g1995120/ HEAD > tig-0.7.4.g1995120.tar tar rf tig-0.7.4.g1995120.tar tig-0.7.4.g1995120/tig.spec gzip -f -9 tig-0.7.4.g1995120.tar rpmbuild -ta tig-0.7.4.g1995120.tar.gz Executing(%prep): /bin/sh -e /var/tmp/rpm-tmp.72336 Executing(%build): /bin/sh -e /var/tmp/rpm-tmp.72336 make[1]: Entering directory `/home/local/builddir/BUILD/tig-0.7.4.g1995120' cc -Wall -O2 '-DVERSION="0.7.git"' tig.c -lcurses -o tig asciidoc -b docbook -d manpage -aversion=0.7.git tig.1.txt xmlto -m manpage.xsl man tig.1.xml [...] Note the mismatch in the versions: 0.7.4.g1995120 vs 0.7.git (by the way, shouldn't it be 0.7.tig?), even when building from live repo, and not from tarball. This is 3rd patch in the series, but it is actually independent on the rest, and can be applied in any order. Makefile | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 0e42de6..bc8086f 100644 --- a/Makefile +++ b/Makefile @@ -76,7 +76,10 @@ dist: tig.spec git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar @mkdir -p $(TARNAME) @cp tig.spec $(TARNAME) - tar rf $(TARNAME).tar $(TARNAME)/tig.spec + echo $(VERSION) > $(TARNAME)/VERSION + tar rf $(TARNAME).tar \ + $(TARNAME)/tig.spec \ + $(TARNAME)/VERSION @rm -rf $(TARNAME) gzip -f -9 $(TARNAME).tar -- 1.5.2 - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
