Received: from sebsite.pw (sebsite.pw [71.19.150.50]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 82A1B780DB4 for <~alpine/aports@lists.alpinelinux.org>; Fri, 11 Feb 2022 02:07:48 +0000 (UTC) Received: from localhost.localdomain (unknown [8.9.88.219]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by sebsite.pw (Postfix) with ESMTPSA id 3833738016E; Fri, 11 Feb 2022 02:00:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=sebsite.pw; s=sebsite; t=1644544844; bh=VCE3vMivCHa+ujLej/D6zoKJUyXlTKerfwkn8iL5fc8=; h=From:To:Cc:Subject:Date; b=tCW/qoooseVtqv+OKlu/jhPNmvzOH3oM6Xl8XvODvoXjrpI62CtA4/s/r6urBPIrI 0lmMq0+jfHx9571K4y/Lqg5Jlqc7OM1mMo7218jADHdIwPzFyECM4cm0lSPP2g6Jkz 51yA4RVllDPOxkzM3njlQywm9KVQJP4osFypge62nOgo+QmGiyj6NlJwErPNIxj7Nd 2Fl9g5WTCyPt9n2fWE+peKdQtklEXhogLvLSDmgfshFFQ0NteV58RwQ2IErIMCtSfH jK3c2ijHxPZCXUhY5OfJM+Y2t0k4WBbgveyCQt3gg1QNt4f5WzwFrNs5Yhgiau+94H K5At3+xE6toTw== From: Sebastian To: ~alpine/aports@lists.alpinelinux.org Cc: Sebastian Subject: [PATCH] community/apenwarr-redo: add docs and bash completions Date: Thu, 10 Feb 2022 20:59:44 -0500 Message-Id: <20220211015944.4632-1-sebastian@sebsite.pw> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Signed-off-by: Sebastian --- community/apenwarr-redo/APKBUILD | 16 +++++++++++----- community/apenwarr-redo/fix-env-python.patch | 15 ++++++++++++++- 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/community/apenwarr-redo/APKBUILD b/community/apenwarr-redo/APKBUILD index 5c965ead..1fe21283 100644 --- a/community/apenwarr-redo/APKBUILD +++ b/community/apenwarr-redo/APKBUILD @@ -2,15 +2,15 @@ # Maintainer: Kevin Daudt pkgname=apenwarr-redo pkgver=0.42c -pkgrel=1 +pkgrel=2 pkgdesc="Smaller, easier, more powerful, and more reliable than make" url="https://redo.readthedocs.io/en/latest/" arch="noarch" license="Apache-2.0" depends="python3" -makedepends="perl" +makedepends="perl py3-beautifulsoup4 py3-markdown" checkdepends="cpio" -subpackages="$pkgname-doc" +subpackages="$pkgname-bash-completion $pkgname-doc" source="https://github.com/apenwarr/redo/archive/redo-$pkgver.tar.gz fix-env-python.patch " @@ -21,16 +21,21 @@ builddir="$srcdir/redo-redo-$pkgver" build() { ./do build + find docs -name 'redo*.md' | sed 's/md$/1/' | xargs bin/redo } check() { # Causes issues with the test suite - unset CC CPPFLAGS CFLAGS CXX CXXFLAGS LDFLAGS + unset ARCH CC CPPFLAGS CFLAGS CXX CXXFLAGS LDFLAGS ./do test } package() { DESTDIR="$pkgdir" PREFIX="/usr" ./do install + install -Dm644 contrib/bash_completion.d/redo \ + "$pkgdir"/usr/share/bash-completion/completions/redo.sh + install -Dm644 docs/*.1 \ + "$pkgdir"/usr/share/man/man1/ } cleanup_srcdir() { @@ -42,4 +47,5 @@ cleanup_srcdir() { } sha512sums="764ef84cfb56d5dd883cf80f706a567491e1a679d136219c4db3c122386aad3cfbd28131dc231a91639f596d7b8819c4254e4e7fa38f917996ca8bf3e1a5dc19 redo-0.42c.tar.gz -8b01a70e0812bf6c90c8447d110eac91639c35e3e3c20a083d4ed68fe0b3a3524081ad94fa1fd504525b7ebf5ef1fd5aff9fe3b933fe9f0aa2a404426ed96471 fix-env-python.patch" +7d8be0b94999c54d6d1d47300189c4979294cf3d9ddd30f2f3c95b12f16e7dc180ad7c518bcf1dd91f3ddace8e769880ac30bf659f4c9973872cb75bc15d89c7 fix-env-python.patch +" diff --git a/community/apenwarr-redo/fix-env-python.patch b/community/apenwarr-redo/fix-env-python.patch index 49c59584..ef0853f1 100644 --- a/community/apenwarr-redo/fix-env-python.patch +++ b/community/apenwarr-redo/fix-env-python.patch @@ -47,4 +47,17 @@ index fa679d2..868cae5 100644 +#!/usr/bin/env python3 """Test program for auto-generated version.py""" import version - + +diff --git a/redo/py.do b/redo/py.do +index 11d4bf4..d293d09 100644 +--- a/redo/py.do ++++ b/redo/py.do +@@ -1,7 +1,5 @@ +-redo-ifchange whichpython +-read py $3 <<-EOF + #!/bin/sh +- exec $py "\$@" ++ exec /usr/bin/python3 "\$@" + EOF + chmod a+x $3 -- 2.34.1