Merge branch 'jn/rpm-updates'

Conflicts:

	Makefile

diff --cc Makefile
index 539ade09f822482137d042c950dd5e0d5ac6a8cf,bc8086fdcf7a8494e2e719607972d64403e7ad35..61fc86b246f9615996ec9e4eb78c5520b32f99f1
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -73,13 -73,15 +73,14 @@@ strip: al
        strip $(PROGS)
  
  dist: tig.spec
 -      git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar
 -      @mkdir -p $(TARNAME)
 -      @cp tig.spec $(TARNAME)
 +      @mkdir -p $(TARNAME) && \
-       cp tig.spec $(TARNAME)
++      cp tig.spec $(TARNAME) && \
+       echo $(VERSION) > $(TARNAME)/VERSION
 -      tar rf $(TARNAME).tar \
 -             $(TARNAME)/tig.spec \
 -             $(TARNAME)/VERSION
 +      git-archive --format=tar --prefix=$(TARNAME)/ HEAD > $(TARNAME).tar && \
-       tar rf $(TARNAME).tar $(TARNAME)/tig.spec && \
++      tar rf $(TARNAME).tar $(TARNAME)/tig.spec $(TARNAME)/VERSION && \
 +      gzip -f -9 $(TARNAME).tar && \
 +      md5sum $(TARNAME).tar.gz > $(TARNAME).tar.gz.md5
        @rm -rf $(TARNAME)
 -      gzip -f -9 $(TARNAME).tar
  
  rpm: dist
        rpmbuild -ta $(TARNAME).tar.gz