From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 2 Jun 2007 09:03:12 +0000 (+0200)
Subject: Merge branch 'jn/rpm-updates'
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=cf63d30cbc4efb2bb87e52c4e54366751bb958fa;p=tig.git

Merge branch 'jn/rpm-updates'

Conflicts:

	Makefile
---

cf63d30cbc4efb2bb87e52c4e54366751bb958fa
diff --cc Makefile
index 539ade0,bc8086f..61fc86b
--- a/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