diff --git a/mercurial.spec b/mercurial.spec index fda679b..924cbd4 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -69,7 +69,7 @@ Provides: %{name}%{?_isa} = %{version}-%{release} Requires: python3 emacs-filesystem Requires: %{name}-lang = %{version}-%{release} Obsoletes: emacs-mercurial <= 3.4.1, emacs-mercurial-el <= 3.4.1 -Conflicts: %{name}-py2 < %{version}-%{release} +Obsoletes: %{name}-py2 < %{version}-%{release} Requires(post): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives @@ -81,8 +81,7 @@ Quick start: http://www.selenic.com/mercurial/wiki/index.cgi/QuickStart Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension -This Mercurial runs on Python 3. It's expected to obsolete the Python 2 version -when dependent packages are prepared to use Python 3 by default. +This Mercurial runs on Python 3 and is obsoleting the Python 2 version. %package hgk