diff --git a/contrib/packaging/buildrpm b/contrib/packaging/buildrpm --- a/contrib/packaging/buildrpm +++ b/contrib/packaging/buildrpm @@ -6,7 +6,7 @@ BUILD=1 RPMBUILDDIR="$PWD/rpmbuild" -PYTHONEXE=python2 +PYTHONEXE=python3 while [ "$1" ]; do case "$1" in diff --git a/contrib/packaging/docker/fedora29 b/contrib/packaging/docker/fedora29 --- a/contrib/packaging/docker/fedora29 +++ b/contrib/packaging/docker/fedora29 @@ -7,8 +7,8 @@ RUN dnf install -y \ gcc \ gettext \ make \ - python-devel \ - python-docutils \ + python3-devel \ + python3-docutils \ rpm-build # For creating repo meta data diff --git a/contrib/packaging/mercurial.spec b/contrib/packaging/mercurial.spec --- a/contrib/packaging/mercurial.spec +++ b/contrib/packaging/mercurial.spec @@ -2,7 +2,7 @@ %define withpython %{nil} -%global pythonexe python2 +%global pythonexe python3 %if "%{?withpython}" @@ -39,8 +39,8 @@ BuildRequires: make, gcc, gettext %if "%{?withpython}" BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel %else -BuildRequires: python >= %{pythonver}, python-devel, python-docutils >= 0.5 -Requires: python >= %{pythonver} +BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, %{pythonexe}-docutils >= 0.5 +Requires: %{pythonexe} >= %{pythonver} %endif # The hgk extension uses the wish tcl interpreter, but we don't enforce it #Requires: tk