Move main package back to mercurial without py3 suffix
This commit is contained in:
parent
5b9b9bf00b
commit
084cfec88f
@ -21,6 +21,14 @@ BuildRequires: pkgconfig
|
||||
BuildRequires: python3-devel
|
||||
BuildRequires: python3-docutils
|
||||
|
||||
Provides: hg = %{version}-%{release}
|
||||
Requires: python3
|
||||
Requires: emacs-filesystem
|
||||
Requires: %{name}-lang = %{version}-%{release}
|
||||
# TODO: drop these obsoletes in F36
|
||||
Obsoletes: %{name}-py2 < %{version}-%{release}
|
||||
Obsoletes: %{name}-py3 < %{version}-%{release}
|
||||
|
||||
%description
|
||||
Mercurial is a fast, lightweight source control management system designed
|
||||
for efficient handling of very large distributed projects.
|
||||
@ -30,27 +38,6 @@ Tutorial: http://www.selenic.com/mercurial/wiki/index.cgi/Tutorial
|
||||
Extensions: http://www.selenic.com/mercurial/wiki/index.cgi/CategoryExtension
|
||||
|
||||
|
||||
%package py3
|
||||
Summary: Mercurial -- a distributed SCM (Python 3 version)
|
||||
Provides: hg = %{version}-%{release}
|
||||
Provides: %{name} = %{version}-%{release}
|
||||
Provides: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires: python3
|
||||
Requires: emacs-filesystem
|
||||
Requires: %{name}-lang = %{version}-%{release}
|
||||
Obsoletes: %{name}-py2 < %{version}-%{release}
|
||||
|
||||
%description py3
|
||||
Mercurial is a fast, lightweight source control management system designed
|
||||
for efficient handling of very large distributed projects.
|
||||
|
||||
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 and is obsoleting the Python 2 version.
|
||||
|
||||
|
||||
%package hgk
|
||||
Summary: Hgk interface for mercurial
|
||||
Requires: hg = %{version}-%{release}
|
||||
@ -171,7 +158,7 @@ grep -v locale %{name}-base.files > %{name}-base-filtered.files
|
||||
pathfix.py -pni "%{python3}" %{buildroot}%{_bindir}/hg-ssh
|
||||
|
||||
|
||||
%files py3 -f %{name}-base-filtered.files
|
||||
%files -f %{name}-base-filtered.files
|
||||
%doc CONTRIBUTORS COPYING doc/README doc/hg*.txt doc/hg*.html *.cgi contrib/*.fcgi contrib/*.wsgi
|
||||
%doc %attr(644,root,root) %{_mandir}/man?/hg*.gz
|
||||
%doc %attr(644,root,root) contrib/*.svg
|
||||
|
Loading…
Reference in New Issue
Block a user