SPECS: git.spec - rename binary to git.gnu to avoid collision with...

[adamg]

Author: adamg                        Date: Mon Oct 31 15:59:04 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rename binary to git.gnu to avoid collision with git-core

---- Files affected:
SPECS:
   git.spec (1.36 -> 1.37) 

---- Diffs:

================================================================
Index: SPECS/git.spec
diff -u SPECS/git.spec:1.36 SPECS/git.spec:1.37
--- SPECS/git.spec:1.36	Fri Oct 14 08:26:54 2005
+++ SPECS/git.spec	Mon Oct 31 16:58:51 2005
@@ -1,7 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - there's a conflict between git-core and git (git binary), 
-#   rename the latter to git.gnu?
 Summary:	A set of GNU Interactive Tools
 Summary(de):	GIT - GNU Interactive Tools
 Summary(fr):	GIT - Outils interactifs de GNU
@@ -9,7 +6,7 @@
 Summary(tr):	GNU görsel kabuđu
 Name:		git
 Version:	4.3.20
-Release:	9
+Release:	10
 License:	GPL
 Group:		Applications/File
 Source0:	ftp://ftp.gnu.org/pub/gnu/git/%{name}-%{version}.tar.gz
@@ -90,6 +87,10 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
+# rename the binary to avoid collision with git-core 
+# OTOH, Debian renamed git-core. 
+mv -f $RPM_BUILD_ROOT%{_bindir}/git{,.gnu}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -115,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.37  2005/10/31 15:58:51  adamg
+- rename binary to git.gnu to avoid collision with git-core
+
 Revision 1.36  2005/10/14 06:26:54  adamg
 - ToDo added (conflict between git and git-core)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/git.spec?r1=1.36&r2=1.37&f=u