Rename the RPM from "git" to "git-core"

That way we avoid any confusion with "GNU Interactive Tools", and it's
more descriptive anyway (the rpm documentation talks about how git is
split into a "core" part and an "SCM" part, this makes it clear that
this is the core one).

diff --git a/Makefile b/Makefile
index 93479ae653f3c6d351957f8a7151f3e0d0a748cb..0bfa0c1ee446d4d2d8fae4792f0a4e60096b7c96 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -172,20 +172,20 @@ diffcore-break.o : $(LIB_H) diffcore.h
 diffcore-order.o : $(LIB_H) diffcore.h
 epoch.o: $(LIB_H)
 
-git.spec: git.spec.in
+git-core.spec: git-core.spec.in
        sed -e 's/@@VERSION@@/$(GIT_VERSION)/g' < $< > $@
 
-GIT_TARNAME=git-$(GIT_VERSION)
-dist: git.spec git-tar-tree
+GIT_TARNAME=git-core-$(GIT_VERSION)
+dist: git-core.spec git-tar-tree
        ./git-tar-tree HEAD $(GIT_TARNAME) > $(GIT_TARNAME).tar
        @mkdir -p $(GIT_TARNAME)
-       @cp git.spec $(GIT_TARNAME)
-       tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git.spec
+       @cp git-core.spec $(GIT_TARNAME)
+       tar rf $(GIT_TARNAME).tar $(GIT_TARNAME)/git-core.spec
        @rm -rf $(GIT_TARNAME)
        gzip -9 $(GIT_TARNAME).tar
 
 rpm: dist
-       rpmbuild -ta git-$(GIT_VERSION).tar.gz
+       rpmbuild -ta git-core-$(GIT_VERSION).tar.gz
 
 test: all
        $(MAKE) -C t/ all

diff --git a/git.spec.in b/git-core.spec.in
similarity index 98%
rename from git.spec.in
rename to git-core.spec.in
index f019b532cb9d05d70f6c36b2bbd4c57315cff07d..099451090b7da1321a25babdf1a758198cb2843e 100644 (file)
--- a/git.spec.in
+++ b/git-core.spec.in
@@ -1,4 +1,4 @@
-Name:          git
+Name:          git-core
 Version:       @@VERSION@@
 Release:       1
 Vendor:        Linus Torvalds <torvalds@osdl.org>