From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 6 May 2016 21:45:44 +0000 (-0700)
Subject: Merge branch 'jc/drop-git-spec-in'
X-Git-Tag: v2.9.0-rc0~67
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/54b0ac57ab90c233a5a076904173c82e3d7db509?ds=sidebyside;hp=-c

Merge branch 'jc/drop-git-spec-in'

As nobody maintains our in-tree git.spec.in and distros use their
own spec file, we stopped pretending that we support "make rpm".

* jc/drop-git-spec-in:
Makefile: remove dependency on git.spec
Makefile: stop pretending to support rpmbuild
---

54b0ac57ab90c233a5a076904173c82e3d7db509
diff --combined Makefile
index 6c4e2dbbc8,8083b10a85..3f03366bcd
--- a/Makefile
+++ b/Makefile
@@@ -355,6 -355,9 +355,6 @@@ all:
  #
  # Define HAVE_CLOCK_MONOTONIC if your platform has CLOCK_MONOTONIC in librt.
  #
 -# Define NO_HMAC_CTX_CLEANUP if your OpenSSL is version 0.9.6b or earlier to
 -# cleanup the HMAC context with the older HMAC_cleanup function.
 -#
  # Define USE_PARENS_AROUND_GETTEXT_N to "yes" if your compiler happily
  # compiles the following initialization:
  #
@@@ -440,7 -443,6 +440,6 @@@ DIFF = dif
  TAR = tar
  FIND = find
  INSTALL = install
- RPMBUILD = rpmbuild
  TCL_PATH = tclsh
  TCLTK_PATH = wish
  XGETTEXT = xgettext
@@@ -621,7 -623,7 +620,7 @@@ TEST_PROGRAMS_NEED_X += test-svn-f
  TEST_PROGRAMS_NEED_X += test-urlmatch-normalization
  TEST_PROGRAMS_NEED_X += test-wildmatch
  
 -TEST_PROGRAMS = $(patsubst %,%$X,$(TEST_PROGRAMS_NEED_X))
 +TEST_PROGRAMS = $(patsubst %,t/helper/%$X,$(TEST_PROGRAMS_NEED_X))
  
  # List built-in command $C whose implementation cmd_$C() is not in
  # builtin/$C.o but is linked in as part of some other command.
@@@ -1135,6 -1137,9 +1134,6 @@@ ifndef NO_OPENSS
  	ifdef NEEDS_CRYPTO_WITH_SSL
  		OPENSSL_LIBSSL += -lcrypto
  	endif
 -	ifdef NO_HMAC_CTX_CLEANUP
 -		BASIC_CFLAGS += -DNO_HMAC_CTX_CLEANUP
 -	endif
  else
  	BASIC_CFLAGS += -DNO_OPENSSL
  	BLK_SHA1 = 1
@@@ -1898,7 -1903,7 +1897,7 @@@ VCSSVN_OBJS += vcs-svn/fast_export.
  VCSSVN_OBJS += vcs-svn/svndiff.o
  VCSSVN_OBJS += vcs-svn/svndump.o
  
 -TEST_OBJS := $(patsubst test-%$X,test-%.o,$(TEST_PROGRAMS))
 +TEST_OBJS := $(patsubst %$X,%.o,$(TEST_PROGRAMS))
  OBJECTS := $(LIB_OBJS) $(BUILTIN_OBJS) $(PROGRAM_OBJS) $(TEST_OBJS) \
  	$(XDIFF_OBJS) \
  	$(VCSSVN_OBJS) \
@@@ -2205,7 -2210,7 +2204,7 @@@ bin-wrappers/%: wrap-for-bin.s
  	@mkdir -p bin-wrappers
  	$(QUIET_GEN)sed -e '1s|#!.*/sh|#!$(SHELL_PATH_SQ)|' \
  	     -e 's|@@BUILD_DIR@@|$(shell pwd)|' \
 -	     -e 's|@@PROG@@|$(@F)|' < $< > $@ && \
 +	     -e 's|@@PROG@@|$(patsubst test-%,t/helper/test-%,$(@F))|' < $< > $@ && \
  	chmod +x $@
  
  # GNU make supports exporting all variables by "export" without parameters.
@@@ -2225,25 -2230,25 +2224,25 @@@ perf: al
  
  .PHONY: test perf
  
 -test-ctype$X: ctype.o
 +t/helper/test-ctype$X: ctype.o
  
 -test-date$X: date.o ctype.o
 +t/helper/test-date$X: date.o ctype.o
  
 -test-delta$X: diff-delta.o patch-delta.o
 +t/helper/test-delta$X: diff-delta.o patch-delta.o
  
 -test-line-buffer$X: vcs-svn/lib.a
 +t/helper/test-line-buffer$X: vcs-svn/lib.a
  
 -test-parse-options$X: parse-options.o parse-options-cb.o
 +t/helper/test-parse-options$X: parse-options.o parse-options-cb.o
  
 -test-svn-fe$X: vcs-svn/lib.a
 +t/helper/test-svn-fe$X: vcs-svn/lib.a
  
  .PRECIOUS: $(TEST_OBJS)
  
 -test-%$X: test-%.o GIT-LDFLAGS $(GITLIBS)
 +t/helper/test-%$X: t/helper/test-%.o GIT-LDFLAGS $(GITLIBS)
  	$(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) $(filter %.o,$^) $(filter %.a,$^) $(LIBS)
  
 -check-sha1:: test-sha1$X
 -	./test-sha1.sh
 +check-sha1:: t/helper/test-sha1$X
 +	t/helper/test-sha1.sh
  
  SP_OBJ = $(patsubst %.o,%.sp,$(C_OBJ))
  
@@@ -2257,10 -2262,10 +2256,10 @@@ sparse: $(SP_OBJ
  check: common-cmds.h
  	@if sparse; \
  	then \
 -		echo 2>&1 "Use 'make sparse' instead"; \
 +		echo >&2 "Use 'make sparse' instead"; \
  		$(MAKE) --no-print-directory sparse; \
  	else \
 -		echo 2>&1 "Did you mean 'make test'?"; \
 +		echo >&2 "Did you mean 'make test'?"; \
  		exit 1; \
  	fi
  
@@@ -2390,31 -2395,25 +2389,25 @@@ quick-install-html
  
  ### Maintainer's dist rules
  
- git.spec: git.spec.in GIT-VERSION-FILE
- 	sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
- 	mv $@+ $@
- 
  GIT_TARNAME = git-$(GIT_VERSION)
- dist: git.spec git-archive$(X) configure
+ dist: git-archive$(X) configure
  	./git-archive --format=tar \
  		--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
  	@mkdir -p $(GIT_TARNAME)
- 	@cp git.spec configure $(GIT_TARNAME)
+ 	@cp configure $(GIT_TARNAME)
  	@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
  	@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
  	$(TAR) rf $(GIT_TARNAME).tar \
- 		$(GIT_TARNAME)/git.spec \
  		$(GIT_TARNAME)/configure \
  		$(GIT_TARNAME)/version \
  		$(GIT_TARNAME)/git-gui/version
  	@$(RM) -r $(GIT_TARNAME)
  	gzip -f -9 $(GIT_TARNAME).tar
  
- rpm: dist
- 	$(RPMBUILD) \
- 		--define "_source_filedigest_algorithm md5" \
- 		--define "_binary_filedigest_algorithm md5" \
- 		-ta $(GIT_TARNAME).tar.gz
+ rpm::
+ 	@echo >&2 "Use distro packaged sources to run rpmbuild"
+ 	@false
+ .PHONY: rpm
  
  htmldocs = git-htmldocs-$(GIT_VERSION)
  manpages = git-manpages-$(GIT_VERSION)
@@@ -2450,8 -2449,8 +2443,8 @@@ profile-clean
  	$(RM) $(addsuffix *.gcno,$(addprefix $(PROFILE_DIR)/, $(object_dirs)))
  
  clean: profile-clean coverage-clean
 -	$(RM) *.o *.res refs/*.o block-sha1/*.o ppc/*.o compat/*.o compat/*/*.o
 -	$(RM) xdiff/*.o vcs-svn/*.o ewah/*.o builtin/*.o
 +	$(RM) *.res
 +	$(RM) $(OBJECTS)
  	$(RM) $(LIB_FILE) $(XDIFF_LIB) $(VCSSVN_LIB)
  	$(RM) $(ALL_PROGRAMS) $(SCRIPT_LIB) $(BUILT_INS) git$X
  	$(RM) $(TEST_PROGRAMS) $(NO_INSTALL)