Permalink
Browse files

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

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 <gitster@pobox.com>
  • Loading branch information...
1 parent 030e0e5 commit 5587cac28be66acf5edc2a4b83b67c8cfffbc5e9 @gitster gitster committed Sep 2, 2007
Showing with 17 additions and 3 deletions.
  1. +10 −0 Documentation/RelNotes-1.5.3.1.txt
  2. +4 −1 Documentation/git.txt
  3. +1 −1 GIT-VERSION-GEN
  4. +1 −1 RelNotes
  5. +1 −0 git.spec.in
@@ -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.
@@ -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],
View
@@ -1,7 +1,7 @@
#!/bin/sh
GVF=GIT-VERSION-FILE
-DEF_VER=v1.5.3.GIT
+DEF_VER=v1.5.3.1.GIT
LF='
'
View
View
@@ -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

0 comments on commit 5587cac

Please sign in to comment.