Merge branch 'jb/remote-rm'

diff --git a/git.spec.in b/git.spec.in
index fe7b3d821567fd7a8108ae3fd7a90cdd5baac72a..bdb293d990952a0e4604599b82fced4cbffedf38 100644 (file)
--- 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