Skip to content

Commit 54b0ac5

Browse files
committed
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
2 parents e250f49 + ef642ff commit 54b0ac5

File tree

2 files changed

+6
-343
lines changed

2 files changed

+6
-343
lines changed

Makefile

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,6 @@ DIFF = diff
440440
TAR = tar
441441
FIND = find
442442
INSTALL = install
443-
RPMBUILD = rpmbuild
444443
TCL_PATH = tclsh
445444
TCLTK_PATH = wish
446445
XGETTEXT = xgettext
@@ -2390,31 +2389,25 @@ quick-install-html:
23902389

23912390
### Maintainer's dist rules
23922391

2393-
git.spec: git.spec.in GIT-VERSION-FILE
2394-
sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@+
2395-
mv $@+ $@
2396-
23972392
GIT_TARNAME = git-$(GIT_VERSION)
2398-
dist: git.spec git-archive$(X) configure
2393+
dist: git-archive$(X) configure
23992394
./git-archive --format=tar \
24002395
--prefix=$(GIT_TARNAME)/ HEAD^{tree} > $(GIT_TARNAME).tar
24012396
@mkdir -p $(GIT_TARNAME)
2402-
@cp git.spec configure $(GIT_TARNAME)
2397+
@cp configure $(GIT_TARNAME)
24032398
@echo $(GIT_VERSION) > $(GIT_TARNAME)/version
24042399
@$(MAKE) -C git-gui TARDIR=../$(GIT_TARNAME)/git-gui dist-version
24052400
$(TAR) rf $(GIT_TARNAME).tar \
2406-
$(GIT_TARNAME)/git.spec \
24072401
$(GIT_TARNAME)/configure \
24082402
$(GIT_TARNAME)/version \
24092403
$(GIT_TARNAME)/git-gui/version
24102404
@$(RM) -r $(GIT_TARNAME)
24112405
gzip -f -9 $(GIT_TARNAME).tar
24122406

2413-
rpm: dist
2414-
$(RPMBUILD) \
2415-
--define "_source_filedigest_algorithm md5" \
2416-
--define "_binary_filedigest_algorithm md5" \
2417-
-ta $(GIT_TARNAME).tar.gz
2407+
rpm::
2408+
@echo >&2 "Use distro packaged sources to run rpmbuild"
2409+
@false
2410+
.PHONY: rpm
24182411

24192412
htmldocs = git-htmldocs-$(GIT_VERSION)
24202413
manpages = git-manpages-$(GIT_VERSION)

git.spec.in

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

0 commit comments

Comments
 (0)