GIT 1.5.3.1: obsolete git-p4 in RPM spec file.

gitster · gitster · commit 5587cac28be6 · 2007-09-03T01:28:37.000-07:00
HPA noticed that yum does not like the newer git RPM set; it turns out
that we do not ship git-p4 anymore but existing installations do not
realize the package is gone if we do not tell anything about it.

David Kastrup suggests using Obsoletes in the spec file of the new
RPM to replace the old package, so here is a try.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/Documentation/RelNotes-1.5.3.1.txt b/Documentation/RelNotes-1.5.3.1.txt
@@ -0,0 +1,10 @@
+GIT v1.5.3.1 Release Notes
+==========================
+
+Fixes since v1.5.3
+------------------
+
+This is solely to fix the generated RPM's dependencies.  We used
+to have git-p4 package but we do not anymore.  As suggested on
+the mailing list, this release makes git-core "Obsolete" git-p4,
+so that yum update would not complain.
diff --git a/Documentation/git.txt b/Documentation/git.txt
@@ -43,7 +43,10 @@ unreleased) version of git, that is available from 'master'
 branch of the `git.git` repository.
 Documentation for older releases are available here:
 
-* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
+* link:v1.5.3/git.html[documentation for release 1.5.3]
+
+* release notes for
+  link:RelNotes-1.5.3.1.txt[1.5.3.1].
 
 * release notes for
   link:RelNotes-1.5.2.5.txt[1.5.2.5],
diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.3.GIT
+DEF_VER=v1.5.3.1.GIT
 
 LF='
 '
diff --git a/RelNotes b/RelNotes
@@ -1 +1 @@
-Documentation/RelNotes-1.5.3.txt
+Documentation/RelNotes-1.5.3.1.txt
diff --git a/git.spec.in b/git.spec.in
@@ -25,6 +25,7 @@ This is a dummy package which brings in all subpackages.
 Summary:	Core git tools
 Group:		Development/Tools
 Requires:	zlib >= 1.2, rsync, curl, less, openssh-clients, expat
+Obsoletes:	git-p4
 %description core
 Git is a fast, scalable, distributed revision control system with an
 unusually rich command set that provides both high-level operations

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`#!/bin/sh`
`2`	`2`
`3`	`3`	`GVF=GIT-VERSION-FILE`
`4`		`-DEF_VER=v1.5.3.GIT`
	`4`	`+DEF_VER=v1.5.3.1.GIT`
`5`	`5`
`6`	`6`	`LF='`
`7`	`7`	`'`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-Documentation/RelNotes-1.5.3.txt`
	`1`	`+Documentation/RelNotes-1.5.3.1.txt`