diff --git a/mercurial.spec b/mercurial.spec index b4df555..6281b97 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -1,7 +1,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 5.6.1 -Release: 5%{?dist} +Release: 6%{?dist} # Release: 1.rc1%%{?dist} @@ -25,10 +25,13 @@ BuildRequires: python3-docutils Provides: hg = %{version}-%{release} Requires: python3 Requires: emacs-filesystem + # TODO: drop these obsoletes in F36 Obsoletes: %{name}-py2 < %{version}-%{release} Obsoletes: %{name}-py3 < %{version}-%{release} Obsoletes: %{name}-lang < %{version}-%{release} +Provides: %{name}-py3 = %{version}-%{release} +Provides: %{name}-lang = %{version}-%{release} %description Mercurial is a fast, lightweight source control management system designed @@ -189,6 +192,10 @@ pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh %changelog +* Wed Jan 20 2021 Petr Stodulka - 5.6.1-6 +- Set Provides for the obsoleted mercurial-py3 and mercurial-lang rpms +- Relates: #1917946 + * Sun Jan 3 03:39:35 CET 2021 Mads Kiilerich - 5.6.1-5 - Stop providing hg3 - that is the only hg we have - Drop alternatives - there is no alternative