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 93479ae..0bfa0c1 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-core.spec.in b/git-core.spec.in
new file mode 100644 (file)
index 0000000..0994510
--- /dev/null
+++ b/git-core.spec.in
@@ -0,0 +1,42 @@
+Name:          git-core
+Version:       @@VERSION@@
+Release:       1
+Vendor:        Linus Torvalds <torvalds@osdl.org>
+Summary:       Git core and tools
+License:       GPL
+Group:                 Development/Tools
+URL:           http://kernel.org/pub/software/scm/git/
+Source:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
+BuildRequires: zlib-devel, openssl-devel, curl-devel
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+Prereq:        sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
+
+%description
+GIT comes in two layers. The bottom layer is merely an extremely fast
+and flexible filesystem-based database designed to store directory trees
+with regard to their history. The top layer is a SCM-like tool which
+enables human beings to work with the database in a manner to a degree
+similar to other SCM tools (like CVS, BitKeeper or Monotone).
+
+%prep
+%setup -q
+
+%build
+
+make
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make dest=$RPM_BUILD_ROOT prefix=%{_prefix} install
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(-,root,root)
+%{_bindir}/*
+%doc README COPYING Documentation/*
+
+%changelog
+* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
+- initial git spec file

diff --git a/git.spec.in b/git.spec.in
deleted file mode 100644 (file)
index f019b53..0000000
--- a/git.spec.in
+++ /dev/null
@@ -1,42 +0,0 @@
-Name:          git
-Version:       @@VERSION@@
-Release:       1
-Vendor:        Linus Torvalds <torvalds@osdl.org>
-Summary:       Git core and tools
-License:       GPL
-Group:                 Development/Tools
-URL:           http://kernel.org/pub/software/scm/git/
-Source:        http://kernel.org/pub/software/scm/git/%{name}-%{version}.tar.gz
-BuildRequires: zlib-devel, openssl-devel, curl-devel
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
-Prereq:        sh-utils, diffutils, rsync, rcs, mktemp >= 1.5
-
-%description
-GIT comes in two layers. The bottom layer is merely an extremely fast
-and flexible filesystem-based database designed to store directory trees
-with regard to their history. The top layer is a SCM-like tool which
-enables human beings to work with the database in a manner to a degree
-similar to other SCM tools (like CVS, BitKeeper or Monotone).
-
-%prep
-%setup -q
-
-%build
-
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make dest=$RPM_BUILD_ROOT prefix=%{_prefix} install
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%files
-%defattr(-,root,root)
-%{_bindir}/*
-%doc README COPYING Documentation/*
-
-%changelog
-* Wed Jul 7 2005 Chris Wright <chris@osdl.org>
-- initial git spec file