diff --git a/.gitignore b/.gitignore index b92cd08..07f1955 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ mercurial-1.6.2.tar.gz /mercurial-4.7.tar.gz /contrib-hg-ssh.patch /mercurial-4.9.tar.gz +/mercurial-5.1.2.tar.gz diff --git a/mercurial.spec b/mercurial.spec index 20429f0..47f805a 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -2,8 +2,8 @@ Summary: Mercurial -- a distributed SCM Name: mercurial -Version: 4.9 -Release: 2%{?dist} +Version: 5.1.2 +Release: 1%{?dist} # Release: 1.rc1%%{?dist} @@ -68,7 +68,7 @@ and executes Mercurial commands. %prep %setup -q -n %{name}-%{upstreamversion} # Patch files to use python2 instead of (since lately) non existent python binary. -sed -i 's|python|python2|' %{_builddir}/%{name}-%{version}/Makefile %{_builddir}/%{name}-%{version}/doc/Makefile +sed -ri 's|python\b|python2|' %{_builddir}/%{name}-%{version}/Makefile %{_builddir}/%{name}-%{version}/doc/Makefile %patch0 -p1 -b .contrib-hg-ssh %build @@ -173,6 +173,10 @@ grep -v locale %{name}-base.files > %{name}-base-filtered.files ##cd tests && %%{__python} run-tests.py %changelog +* Sat Oct 19 2019 Petr Stodulka - 5.1.2-1 +- Update to 5.1.2 +- fix patching of Makefiles + * Thu Jul 25 2019 Fedora Release Engineering - 4.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild @@ -185,7 +189,7 @@ grep -v locale %{name}-base.files > %{name}-base-filtered.files * Fri Feb 01 2019 Fedora Release Engineering - 4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild -* Mon Aug 20 2018 Petr Stodulka - 4.7-1 - Update to 4.7 * Sat Aug 11 2018 Tom Prince - 4.5.3-1 diff --git a/sources b/sources index bea31f3..821a8b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mercurial-4.9.tar.gz) = 59a5467cebb51f17cce7bcada37f8d85906493ab2e3d443ceeae2c6598fb69d2d59f1e99c73bd08345c5f90501a7bae0d70e04c770ea7653ec30648e591c97fb +SHA512 (mercurial-5.1.2.tar.gz) = a8ce9d9220a5ddf452264801f06e81fe1e699ff700d085e3f82c6877910c6ef0e594203590f198b7b9e31c9a1ed627c8fa2a3a1513d0c5087cf775835a78c408