@matheusbsbs / matheus-bagliano / commits / 5587cac28b
Fork 0

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>

Junio C Hamano committed Sep 2, 2007 at 15:16 UTC 5587cac28be66acf5edc2a4b83b67c8cfffbc5e9
5 files changed +17 -3
Documentation/RelNotes-1.5.3.1.txt new
+10
@@ -0,0 +1,10 @@
1 +GIT v1.5.3.1 Release Notes
2 +==========================
3 +
4 +Fixes since v1.5.3
5 +------------------
6 +
7 +This is solely to fix the generated RPM's dependencies. We used
8 +to have git-p4 package but we do not anymore. As suggested on
9 +the mailing list, this release makes git-core "Obsolete" git-p4,
10 +so that yum update would not complain.
Documentation/git.txt
+4 -1
@@ -43,7 +43,10 @@ unreleased) version of git, that is available from 'master'
43 branch of the `git.git` repository.
44 Documentation for older releases are available here:
45
46 -* link:v1.5.2.5/git.html[documentation for release 1.5.2.5]
46 +* link:v1.5.3/git.html[documentation for release 1.5.3]
47 +
48 +* release notes for
49 + link:RelNotes-1.5.3.1.txt[1.5.3.1].
50
51 * release notes for
52 link:RelNotes-1.5.2.5.txt[1.5.2.5],
GIT-VERSION-GEN
+1 -1
@@ -1,7 +1,7 @@
1 #!/bin/sh
2
3 GVF=GIT-VERSION-FILE
4 -DEF_VER=v1.5.3.GIT
4 +DEF_VER=v1.5.3.1.GIT
5
6 LF='
7 '
RelNotes
+1 -1
@@ -1 +1 @@
1 -Documentation/RelNotes-1.5.3.txt
\ No newline at end of file
1 +Documentation/RelNotes-1.5.3.1.txt
\ No newline at end of file
git.spec.in
+1
@@ -25,6 +25,7 @@ This is a dummy package which brings in all subpackages.
25 Summary: Core git tools
26 Group: Development/Tools
27 Requires: zlib >= 1.2, rsync, curl, less, openssh-clients, expat
28 +Obsoletes: git-p4
29 %description core
30 Git is a fast, scalable, distributed revision control system with an
31 unusually rich command set that provides both high-level operations