From 135c656f118d41fde6c0b522507c6cd506ae7b19 Mon Sep 17 00:00:00 2001 From: Petr Stodulka Date: Mon, 10 Aug 2020 20:21:34 +0200 Subject: [PATCH] Fix upgrade from previous mercurial 4.9 causing broken alternatives for mercurial Resolves: #1831562 --- mercurial.spec | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/mercurial.spec b/mercurial.spec index 5543038..ed165e1 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -1,7 +1,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 5.2 -Release: 4%{?dist} +Release: 5%{?dist} # Release: 1.rc1%%{?dist} @@ -240,6 +240,11 @@ touch $RPM_BUILD_ROOT%{_bindir}/hg touch $RPM_BUILD_ROOT%{_bindir}/hg-ssh %post py2 +for fname in %{_bindir}/{hg,hg-ssh}; do + if [ ! -L "$fname" ]; then + rm -f "$fname" + fi +done %{_sbindir}/update-alternatives --install %{_bindir}/hg \ hg %{_bindir}/hg2 %{py2_priority} \ --slave %{_bindir}/hg-ssh hg-ssh %{_bindir}/hg-ssh2 || : @@ -251,6 +256,11 @@ if [ $1 -eq 0 ]; then fi %post py3 +for fname in %{_bindir}/{hg,hg-ssh}; do + if [ ! -L "$fname" ]; then + rm -f "$fname" + fi +done %{_sbindir}/update-alternatives --install %{_bindir}/hg \ hg %{_bindir}/hg3 %{py3_priority} \ --slave %{_bindir}/hg-ssh hg-ssh %{_bindir}/hg-ssh3 || : @@ -323,6 +333,11 @@ fi %changelog +* Mon Aug 10 2020 Petr Stodulka - 5.2-5 +- Fix upgrade from previous mercurial 4.9 causing broken alternatives for + mercurial +- Resolves: #1831562 + * Wed Jan 29 2020 Fedora Release Engineering - 5.2-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild