From: Elan Ruusamäe <glen@pld-linux.org>
Date: Wed, 7 Mar 2018 10:09:56 +0000 (+0200)
Subject: move conflicts to main package
X-Git-Tag: auto/th/git-core-2.16.2-2
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fgit-core.git;a=commitdiff_plain;h=f4018182e50b017fef00c880e6c7dd15d2175abb

move conflicts to main package
---

diff --git a/git-core.spec b/git-core.spec
index f908b3a..6e6e4e6 100644
--- a/git-core.spec
+++ b/git-core.spec
@@ -90,6 +90,7 @@ Suggests:	perl-Git = %{version}-%{release}
 Suggests:	rsync
 Obsoletes:	git-core-gitview
 Obsoletes:	python-Git
+Conflicts:	perl-Git < %{version}
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # html docs have links to txt files
@@ -389,7 +390,6 @@ Summary:	Perl interface to the Git version control system
 Summary(pl.UTF-8):	Perlowy interfejs do systemu kontroli wersji Git
 Group:		Development/Languages/Perl
 Obsoletes:	perl-git-core
-Conflicts:	%{name} < %{version}
 %if "%{_rpmversion}" >= "5"
 BuildArch:	noarch
 %endif