mercurial 5.6.1

hgdemandimport_ast.patch

@@ -1,11 +0,0 @@
-diff -U3 -r mercurial-5.4-orig/hgdemandimport/__init__.py mercurial-5.4/hgdemandimport/__init__.py
---- mercurial-5.4-orig/hgdemandimport/__init__.py	2020-05-01 18:17:29.000000000 +0200
-+++ mercurial-5.4/hgdemandimport/__init__.py	2020-09-01 18:04:40.540165952 +0200
-@@ -56,6 +56,7 @@
-     '__builtin__',
-     'builtins',
-     'urwid.command_map',  # for pudb
-+    '_ast', # https://bugzilla.redhat.com/show_bug.cgi?id=1871992
- }
- 
- _pypy = '__pypy__' in sys.builtin_module_names

mercurial.spec

@@ -1,7 +1,7 @@
 Summary: Mercurial -- a distributed SCM
 Name: mercurial
 Version: 5.6.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -13,7 +13,6 @@ URL: https://mercurial-scm.org/
 Source0: https://www.mercurial-scm.org/release/%{name}-%{upstreamversion}.tar.gz
 Source1: mercurial-site-start.el
 Patch2: 0001-setup-hg3.patch
-Patch3: hgdemandimport_ast.patch
 BuildRequires: python2-devel python3-devel bash-completion
 BuildRequires: emacs-nox emacs-el pkgconfig gettext python3-docutils
 BuildRequires: gcc
@@ -133,8 +132,6 @@ Locales for mercurial.
 # sed -ri 's|python\b|python2|' %{_builddir}/%{name}-%{version}/Makefile %{_builddir}/%{name}-%{version}/doc/Makefile
 %patch2 -p1 -b .create_hg3
 
-%patch3 -p1
-
 %build
 # copy hg to hg2/hg3 to be able to create /usr/bin/hg(2|3) script
 cp -a hg hg2
@@ -334,6 +331,10 @@ fi
 
 
 %changelog
+* Thu Dec  3 21:24:26 CET 2020 Mads Kiilerich <mads@kiilerich.com> - 5.6.1-2
+- Drop hgdemandimport_ast.patch - it has been fixed both in Mercurial 5.5.2 and
+  Python 3.9.0rc2
+
 * Thu Dec  3 20:39:41 CET 2020 Mads Kiilerich <mads@kiilerich.com> - 5.6.1-1
 - mercurial 5.6.1