Skip to content

Commit ab21433

Browse files
committed
Makefile: stop pretending to support rpmbuild
Nobody in the active development community seems to watch breakages in the rpmbuild target. As most major RPM based distros use their own specfile when packaging us, they aren't looking after us as their pristine upstream tree, either. At this point, it is turning to be a disservice to the users to pretend that our tree natively supports "make rpmbuild" target when we do not properly maintain it. Signed-off-by: Junio C Hamano <[email protected]>
1 parent f66a5bd commit ab21433

File tree

2 files changed

+5
-342
lines changed

2 files changed

+5
-342
lines changed

Makefile

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,6 @@ DIFF = diff
443443
TAR = tar
444444
FIND = find
445445
INSTALL = install
446-
RPMBUILD = rpmbuild
447446
TCL_PATH = tclsh
448447
TCLTK_PATH = wish
449448
XGETTEXT = xgettext
@@ -2396,31 +2395,25 @@ quick-install-html:
23962395

23972396
### Maintainer's dist rules
23982397

2399-
git.spec: git.spec.in GIT-VERSION-FILE
2400-
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
2401-
mv $@+ $@
2402-
24032398
GIT_TARNAME = git-$(GIT_VERSION)
24042399
dist: git.spec git-archive$(X) configure
24052400
./git-archive --format=tar \
24062401
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
24072402
@mkdir -p $(GIT_TARNAME)
2408-
@cp git.spec configure $(GIT_TARNAME)
2403+
@cp configure $(GIT_TARNAME)
24092404
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
24102405
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
24112406
$(TAR) rf $(GIT_TARNAME).tar \
2412-
$(GIT_TARNAME)/git.spec \
24132407
$(GIT_TARNAME)/configure \
24142408
$(GIT_TARNAME)/version \
24152409
$(GIT_TARNAME)/git-gui/version
24162410
@$(RM) -r $(GIT_TARNAME)
24172411
gzip -f -9 $(GIT_TARNAME).tar
24182412

2419-
rpm: dist
2420-
$(RPMBUILD) \
2421-
--define "_source_filedigest_algorithm md5" \
2422-
--define "_binary_filedigest_algorithm md5" \
2423-
-ta $(GIT_TARNAME).tar.gz
2413+
rpm::
2414+
@echo >&2 "Use distro packaged sources to run rpmbuild"
2415+
@false
2416+
.PHONY: rpm
24242417

24252418
htmldocs = git-htmldocs-$(GIT_VERSION)
24262419
manpages = git-manpages-$(GIT_VERSION)

git.spec.in

Lines changed: 0 additions & 330 deletions
This file was deleted.

0 commit comments

Comments
 (0)