diff options
| -rw-r--r-- | Documentation/RelNotes-1.5.3.1.txt | 10 | ||||
| -rw-r--r-- | Documentation/git.txt | 5 | ||||
| -rwxr-xr-x | GIT-VERSION-GEN | 2 | ||||
| l--------- | RelNotes | 2 | ||||
| -rw-r--r-- | git.spec.in | 1 |
5 files changed, 17 insertions, 3 deletions
diff --git a/Documentation/RelNotes-1.5.3.1.txt b/Documentation/RelNotes-1.5.3.1.txt new file mode 100644 index 000000000..7ff546c74 --- /dev/null +++ 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 index ceca892a0..6f7db2935 100644 --- 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 index 3c0032cec..3835fb396 100755 --- 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=' ' @@ -1 +1 @@ -Documentation/RelNotes-1.5.3.txt
\ No newline at end of file +Documentation/RelNotes-1.5.3.1.txt
\ No newline at end of file diff --git a/git.spec.in b/git.spec.in index fe7b3d821..bdb293d99 100644 --- 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 |