From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Nov 2009 07:08:42 +0000 (-0800)
Subject: Merge branch 'tz/maint-rpm' into maint
X-Git-Tag: v1.6.5.3~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ee16339d044bf594d7e6f6d178c03d8c0bff20fb?hp=-c

Merge branch 'tz/maint-rpm' into maint

* tz/maint-rpm:
Makefile: Ensure rpm packages can be read by older rpm versions
---

ee16339d044bf594d7e6f6d178c03d8c0bff20fb
diff --combined Makefile
index 30656cf62c,fd7a6c9294..856ba098b8
--- a/Makefile
+++ b/Makefile
@@@ -159,10 -159,6 +159,10 @@@ all:
  # Define ASCIIDOC_NO_ROFF if your DocBook XSL escapes raw roff directives
  # (versions 1.72 and later and 1.68.1 and earlier).
  #
 +# Define GNU_ROFF if your target system uses GNU groff.  This forces
 +# apostrophes to be ASCII so that cut&pasting examples to the shell
 +# will work.
 +#
  # Define NO_PERL_MAKEMAKER if you cannot use Makefiles generated by perl's
  # MakeMaker (e.g. using ActiveState under Cygwin).
  #
@@@ -416,7 -412,6 +416,7 @@@ LIB_H += builtin.
  LIB_H += cache.h
  LIB_H += cache-tree.h
  LIB_H += commit.h
 +LIB_H += compat/bswap.h
  LIB_H += compat/cygwin.h
  LIB_H += compat/mingw.h
  LIB_H += csum-file.h
@@@ -1380,7 -1375,7 +1380,7 @@@ SHELL = $(SHELL_PATH
  
  all:: shell_compatibility_test $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS
  ifneq (,$X)
 -	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test '$p' -ef '$p$X' || $(RM) '$p';)
 +	$(QUIET_BUILT_IN)$(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), test -d '$p' -o '$p' -ef '$p$X' || $(RM) '$p';)
  endif
  
  all::
@@@ -1804,7 -1799,10 +1804,10 @@@ dist: git.spec git-archive$(X) configur
  	gzip -f -9 $(GIT_TARNAME).tar
  
  rpm: dist
- 	$(RPMBUILD) -ta $(GIT_TARNAME).tar.gz
+ 	$(RPMBUILD) \
+ 		--define "_source_filedigest_algorithm md5" \
+ 		--define "_binary_filedigest_algorithm md5" \
+ 		-ta $(GIT_TARNAME).tar.gz
  
  htmldocs = git-htmldocs-$(GIT_VERSION)
  manpages = git-manpages-$(GIT_VERSION)
@@@ -1832,7 -1830,7 +1835,7 @@@ distclean: clea
  	$(RM) configure
  
  clean:
 -	$(RM) *.o mozilla-sha1/*.o arm/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
 +	$(RM) *.o block-sha1/*.o arm/*.o ppc/*.o compat/*.o compat/*/*.o xdiff/*.o \
  		$(LIB_FILE) $(XDIFF_LIB)
  	$(RM) $(ALL_PROGRAMS) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS)