Merge branch 'js/maint-diff-color-words' into maint

diff --git a/Makefile b/Makefile
index 30656cf62cdd41b0c4456c5e0220cb2338048654..856ba098b8a6383b81fd7d7b716fae9fc39c7f85 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1804,7 +1804,10 @@ dist: git.spec git-archive$(X) configure
        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)