Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/mercurial.git#4ddc4582ab0be0b6892fe99483c7dce4a5b32d2e

.gitignore

@@ -66,3 +66,4 @@ mercurial-1.6.2.tar.gz
 /mercurial-5.1.2.tar.gz
 /mercurial-5.2.tar.gz
 /mercurial-5.4.tar.gz
+/mercurial-5.6.1.tar.gz

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.4
-Release: 5%{?dist}
+Version: 5.6.1
+Release: 2%{?dist}
 
 # Release: 1.rc1%%{?dist}
 
@@ -9,12 +9,10 @@ Release: 5%{?dist}
 %define upstreamversion %{version}
 
 License: GPLv2+
-URL: http://www.selenic.com/mercurial/
-#Source0: http://www.selenic.com/mercurial/release/%%{name}-%%{version}.tar.gz
-Source0: http://www.selenic.com/mercurial/release/%{name}-%{upstreamversion}.tar.gz
+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
@@ -134,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
@@ -335,6 +331,13 @@ 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
+
 * Mon Nov 30 2020 Miro Hrončok <mhroncok@redhat.com> - 5.4-5
 - Install Python 3 based mercurial by default
 

sources

@@ -1 +1 @@
-SHA512 (mercurial-5.4.tar.gz) = 5f92d653ab74da4696ba7f1402e6cb219c0c514a5eeecb9d7282ab95aef2c6f16d5c8e3d0149525f3dc694a133c713b671ba92327e1b0dc3ad8701d522986d8d
+SHA512 (mercurial-5.6.1.tar.gz) = d84d7d9ae4c738e3cb62b26c4dc7f3943abc1b1a55ccc46a4e3435896f715efb30d4d6ff4df6d02a8bef7bd6ead2d21a44342fb8a2101e8fe04211d21efc13b1