--- a/contrib/packaging/Makefile	Tue Feb 11 15:03:04 2025 +0100
+++ b/contrib/packaging/Makefile	Tue Feb 11 15:31:07 2025 +0100
@@ -21,7 +21,6 @@
 # Build a Python for these RHEL (and derivatives) releases.
 RHEL_WITH_PYTHON_RELEASES := 8
 RHEL_WITH_NONVERSIONED_PYTHON :=
-RHEL_WITH_36_DOCUTILS := 7
 
 .PHONY: help
 help:
@@ -113,13 +112,13 @@
 .PHONY: rhel$(1)
 rhel$(1):
 	mkdir -p $$(HGROOT)/packages/rhel$(1)
-	./buildrpm $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(RHEL_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
+	./buildrpm $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))
 	cp $$(HGROOT)/contrib/packaging/rpmbuild/RPMS/*/* $$(HGROOT)/packages/rhel$(1)
 	cp $$(HGROOT)/contrib/packaging/rpmbuild/SRPMS/* $$(HGROOT)/packages/rhel$(1)
 
 .PHONY: docker-rhel$(1)
 docker-rhel$(1):
-	./dockerrpm rhel$(1) $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))$$(if $$(filter $(1),$$(RHEL_WITH_36_DOCUTILS)), --docutilspackage python36-docutils,)
+	./dockerrpm rhel$(1) $$(if $$(filter $(1),$$(RHEL_WITH_PYTHON_RELEASES)),--withpython,$$(if $$(filter $(1),$$(RHEL_WITH_NONVERSIONED_PYTHON)),--python python,))
 
 endef
 

--- a/contrib/packaging/buildrpm	Tue Feb 11 15:03:04 2025 +0100
+++ b/contrib/packaging/buildrpm	Tue Feb 11 15:31:07 2025 +0100
@@ -7,7 +7,6 @@
 BUILD=1
 RPMBUILDDIR="$PWD/rpmbuild"
 PYTHONEXE=python3
-DOCUTILSPACKAGE=python3-docutils
 
 while [ "$1" ]; do
     case "$1" in
@@ -26,11 +25,6 @@
         PYTHONMD5=6820ac52d77af870f795dabc64583234
         PYTHONEXE=python3
         ;;
-    --docutilspackage)
-        shift
-        DOCUTILSPACKAGE="$1"
-        shift
-        ;;
     --rpmbuilddir )
         shift
         RPMBUILDDIR="$1"
@@ -88,14 +82,6 @@
     fi
     ln -f $PYTHON_SRCFILE $RPMBUILDDIR/SOURCES/$PYTHON_SRCFILE
 
-    DOCUTILSVER=`sed -ne "s/^%global docutilsname docutils-//p" $specfile`
-    DOCUTILS_SRCFILE=docutils-$DOCUTILSVER.tar.gz
-    [ -f $DOCUTILS_SRCFILE ] || curl -Lo $DOCUTILS_SRCFILE http://downloads.sourceforge.net/project/docutils/docutils/$DOCUTILSVER/$DOCUTILS_SRCFILE
-    DOCUTILSMD5=`sed -ne "s/^%global docutilsmd5 //p" $specfile`
-    if [ "$DOCUTILSMD5" ]; then
-        echo "$DOCUTILSMD5 $DOCUTILS_SRCFILE" | md5sum -w -c
-    fi
-    ln -f $DOCUTILS_SRCFILE $RPMBUILDDIR/SOURCES/$DOCUTILS_SRCFILE
 )
 fi
 
@@ -155,9 +141,6 @@
 sed -i \
     -e "s/^%define withpython.*$/%define withpython $RPMPYTHONVER/" \
     $rpmspec
-sed -i \
-    -e "s/^%global pythondocutils.*$/%global pythondocutils $DOCUTILSPACKAGE/" \
-    $rpmspec
 
 if [ "$BUILD" ]; then
     rpmbuild --define "_topdir $RPMBUILDDIR" -ba $rpmspec --clean

--- a/contrib/packaging/mercurial.spec	Tue Feb 11 15:03:04 2025 +0100
+++ b/contrib/packaging/mercurial.spec	Tue Feb 11 15:31:07 2025 +0100
@@ -3,13 +3,10 @@
 %define withpython %{nil}
 
 %global pythonexe python3
-%global pythondocutils python3-docutils
 
 %if "%{?withpython}"
 %global pythonver %{withpython}
 %global pythonname Python-%{withpython}
-%global docutilsname docutils-0.21.2
-%global docutilsmd5 c4064e1e0e3cd142951fd2b95b830874
 %global pythonhg python-hg
 %global hgpyprefix /opt/%{pythonhg}
 # byte compilation will fail on some some Python /test/ files
@@ -31,7 +28,6 @@
 Source0: %{name}-%{version}-%{release}.tar.gz
 %if "%{?withpython}"
 Source1: %{pythonname}.tgz
-Source2: %{docutilsname}.tar.gz
 %endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
@@ -39,7 +35,7 @@
 %if "%{?withpython}"
 BuildRequires: readline-devel, openssl-devel, ncurses-devel, zlib-devel, bzip2-devel
 %else
-BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, %{pythondocutils}
+BuildRequires: %{pythonexe} >= %{pythonver}, %{pythonexe}-devel, python3-docutils
 Requires: %{pythonexe} >= %{pythonver}
 %endif
 # The hgk extension uses the wish tcl interpreter, but we don't enforce it
@@ -52,7 +48,7 @@
 %prep
 
 %if "%{?withpython}"
-%setup -q -n mercurial-%{version}-%{release} -a1 -a2
+%setup -q -n mercurial-%{version}-%{release} -a1
 %else
 %setup -q -n mercurial-%{version}-%{release}
 %endif
@@ -73,23 +69,18 @@
 # remove python reference
 sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python3|' Lib/encodings/rot_13.py
 $PYTHON_FULLPATH -m ensurepip --default-pip
-$PYTHON_FULLPATH -m pip install setuptools setuptools-scm
-cd -
-
-cd %{docutilsname}
-$PYTHON_FULLPATH -m pip install .
+$PYTHON_FULLPATH -m pip install setuptools setuptools-scm docutils
 cd -
 
 # verify Python environment
-LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c 'import sys, zlib, bz2, ssl, curses, readline'
-LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c "import ssl; print(ssl.HAS_TLSv1_2)"
-LD_LIBRARY_PATH=$PYPATH PYTHONPATH=$PWD/%{docutilsname} $PYTHON_FULLPATH -c "import docutils"
+LD_LIBRARY_PATH=$PYPATH $PYTHON_FULLPATH -c 'import sys, zlib, bz2, ssl, curses, readline'
+LD_LIBRARY_PATH=$PYPATH $PYTHON_FULLPATH -c "import ssl; print(ssl.HAS_TLSv1_2)"
+LD_LIBRARY_PATH=$PYPATH $PYTHON_FULLPATH -c "import docutils"
 
 # set environment for make
 export PATH=$PYPATH:$PATH
 export LD_LIBRARY_PATH=$PYPATH
 export CFLAGS="-L $PYPATH"
-export PYTHONPATH=$PWD/%{docutilsname}
 %else
 PYTHON_FULLPATH=$(which python3)
 $PYTHON_FULLPATH -m pip install pip setuptools setuptools-scm packaging --upgrade
@@ -114,11 +105,7 @@
 rm -f %{buildroot}%{hgpyprefix}/lib/{,python2.*/config}/libpython2.*.a
 cd -
 
-cd %{docutilsname}
-$PYTHON_FULLPATH -m pip install . --root="$RPM_BUILD_ROOT"
-cd -
-
-PYTHONPATH=$PWD/%{docutilsname} PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=$PYTHON_FULLPATH DESTDIR=$RPM_BUILD_ROOT PIP_PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust"
+PATH=$PYPATH:$PATH LD_LIBRARY_PATH=$PYPATH make install PYTHON=$PYTHON_FULLPATH DESTDIR=$RPM_BUILD_ROOT PIP_PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} PREFIX=$RPM_BUILD_ROOT/%{hgpyprefix} MANDIR=%{_mandir} PURE="--rust"
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/hg . )
 ( cd $RPM_BUILD_ROOT%{_bindir}/ && ln -s ../..%{hgpyprefix}/bin/python2.? %{pythonhg} )