Jakub Narebski <jnareb@xxxxxxxxx> wrote Fri, Jun 01, 2007: > 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. Gah, somehow I didn't realize the problems of not updating the VERSION file. Beautiful, so now it should actually work even for non-RPM builds using the 'make dist' result. :) -- Jonas Fonseca - 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