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#f79667f9782501d4bbcc0e3bcd1ddfd22a7a7785
This commit is contained in:
DistroBaker 2020-11-30 21:37:43 +00:00
parent 7834e16cac
commit 7ec6856a47

View File

@ -1,7 +1,7 @@
Summary: Mercurial -- a distributed SCM Summary: Mercurial -- a distributed SCM
Name: mercurial Name: mercurial
Version: 5.4 Version: 5.4
Release: 4%{?dist} Release: 5%{?dist}
# Release: 1.rc1%%{?dist} # Release: 1.rc1%%{?dist}
@ -110,7 +110,7 @@ Summary: A fast client for Mercurial command server running on Unix. It saves
Requires: hg = %{version}-%{release} Requires: hg = %{version}-%{release}
# Let's default to Python 2, but allow some experiments # Let's default to Python 2, but allow some experiments
Suggests: hg2 Suggests: hg3
%description chg %description chg
chg is a C wrapper for the hg command. Typically, when you type hg, a new chg is a C wrapper for the hg command. Typically, when you type hg, a new
@ -335,6 +335,9 @@ fi
%changelog %changelog
* Mon Nov 30 2020 Miro Hrončok <mhroncok@redhat.com> - 5.4-5
- Install Python 3 based mercurial by default
* Wed Sep 02 2020 Petr Viktorin <pviktori@redhat.com> - 5.4-4 * Wed Sep 02 2020 Petr Viktorin <pviktori@redhat.com> - 5.4-4
- Add _ast to hgdemandimport ignore list - Add _ast to hgdemandimport ignore list
Works around: BZ#1871992 Works around: BZ#1871992