[packages/git-core] move conflicts to main package
glen
glen at pld-linux.org
Wed Mar 7 11:10:18 CET 2018
commit f4018182e50b017fef00c880e6c7dd15d2175abb
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Wed Mar 7 12:09:56 2018 +0200
move conflicts to main package
git-core.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/git-core.git/commitdiff/f4018182e50b017fef00c880e6c7dd15d2175abb
More information about the pld-cvs-commit
mailing list