From 23267f8251ba390c5ccbe797251bfa54836ea63d Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Mon, 8 Feb 2021 10:58:33 -0500 Subject: [PATCH] hg-evolve: fix conflict with mercurial --- sr.ht/hg-evolve/APKBUILD | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sr.ht/hg-evolve/APKBUILD b/sr.ht/hg-evolve/APKBUILD index e300bb2..0fbd451 100644 --- a/sr.ht/hg-evolve/APKBUILD +++ b/sr.ht/hg-evolve/APKBUILD @@ -4,7 +4,7 @@ pkgname=hg-evolve _pyname=$pkgname pkgver=10.2.0 _pypyver=$pkgver.post1 -pkgrel=0 +pkgrel=1 pkgdesc="Flexible evolution of Mercurial history." url="https://www.mercurial-scm.org/repo/evolve" arch="noarch" @@ -15,6 +15,11 @@ _pypiprefix="${_pyname%${_pyname#?}}" source="https://files.pythonhosted.org/packages/source/$_pypiprefix/$_pyname/$_pyname-$_pypyver.tar.gz" builddir="$srcdir/$pkgname-$_pypyver" +prepare() { + # Conflicts with mercurial: + rm hgext3rd/__init__.py +} + build() { PYTHONPATH="$(pwd)" HGPYTHON3=1 python3 setup.py build -- 2.45.2