From 3ad3b95af528047a61d71c49810fefb091b20751 Mon Sep 17 00:00:00 2001 From: "Neal D. Becker" Date: Tue, 5 Mar 2019 07:44:06 -0500 Subject: [PATCH] fix contrib/hg-ssh shebang --- .gitignore | 1 + contrib-hg-ssh.patch | 10 ++++++++++ mercurial.spec | 7 ++++++- sources | 1 + 4 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 contrib-hg-ssh.patch diff --git a/.gitignore b/.gitignore index 5d1cb39..b3b2dc7 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ mercurial-1.6.2.tar.gz /mercurial-4.4.2.tar.gz /mercurial-4.5.3.tar.gz /mercurial-4.7.tar.gz +/contrib-hg-ssh.patch diff --git a/contrib-hg-ssh.patch b/contrib-hg-ssh.patch new file mode 100644 index 0000000..f03c835 --- /dev/null +++ b/contrib-hg-ssh.patch @@ -0,0 +1,10 @@ +diff -r 9d3628141c21 contrib/hg-ssh +--- a/contrib/hg-ssh Tue Mar 05 07:26:45 2019 -0500 ++++ b/contrib/hg-ssh Tue Mar 05 07:26:54 2019 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # + # Copyright 2005-2007 by Intevation GmbH + # + \ No newline at end of file diff --git a/mercurial.spec b/mercurial.spec index 6fa67a7..8951d4c 100644 --- a/mercurial.spec +++ b/mercurial.spec @@ -3,7 +3,7 @@ Summary: Mercurial -- a distributed SCM Name: mercurial Version: 4.7 -Release: 2%{?dist} +Release: 3%{?dist} # Release: 1.rc1%%{?dist} @@ -15,6 +15,7 @@ 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 Source1: mercurial-site-start.el +Patch0: contrib-hg-ssh.patch BuildRequires: python2 python2-devel bash-completion BuildRequires: emacs-nox emacs-el pkgconfig gettext python2-docutils BuildRequires: gcc @@ -68,6 +69,7 @@ and executes Mercurial commands. %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 +%patch0 -p1 -b .contrib-hg-ssh %build make all @@ -171,6 +173,9 @@ grep -v locale %{name}-base.files > %{name}-base-filtered.files ##cd tests && %%{__python} run-tests.py %changelog +* Tue Mar 5 2019 Neal Becker - 4.7-3 +- Fix shebang for python2 + * Fri Feb 01 2019 Fedora Release Engineering - 4.7-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index c1cf9ca..c81e2c3 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (mercurial-4.7.tar.gz) = a08dfc4e296b5d162097769ab38ab85b7c5de16710bce0b6dce2a39f56cb517455c0ed634f689d07e9bd082fb7641501b7da51963844aee7ab28233cf721dec8 +SHA512 (contrib-hg-ssh.patch) = 71f409ad2c203b489424fd39cd219507f6745b6a365f803b3ea500993e0f4f41b366bf08a1b13c00f03b2d7d089342e0597b51b71da66b00957713b5a5f963ad