From a32f0e799864ca05ee35d9b4df489ceef8d77436 Mon Sep 17 00:00:00 2001 From: Kevin Daudt <kdaudt@alpinelinux.org> Date: Mon, 6 Apr 2020 17:53:18 +0000 Subject: [PATCH] community/apenwarr-redo: upgrade to 0.42a --- community/apenwarr-redo/APKBUILD | 11 +++-- community/apenwarr-redo/fix-env-python.patch | 50 ++++++++++++++++++++ 2 files changed, 57 insertions(+), 4 deletions(-) create mode 100644 community/apenwarr-redo/fix-env-python.patch diff --git a/community/apenwarr-redo/APKBUILD b/community/apenwarr-redo/APKBUILD index d4e70967674a..a3413ee8965e 100644 --- a/community/apenwarr-redo/APKBUILD +++ b/community/apenwarr-redo/APKBUILD @@ -1,17 +1,19 @@ # Contributor: Kevin Daudt <kdaudt@alpinelinux.org> # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org> pkgname=apenwarr-redo -pkgver=0.42 +pkgver=0.42a pkgrel=0 pkgdesc="Smaller, easier, more powerful, and more reliable than make" url="https://redo.readthedocs.io/en/latest/" arch="noarch" license="Apache-2.0" -depends="python2" +depends="python3" makedepends="perl" checkdepends="cpio" subpackages="$pkgname-doc" -source="https://github.com/apenwarr/redo/archive/redo-$pkgver.tar.gz" +source="https://github.com/apenwarr/redo/archive/redo-$pkgver.tar.gz + fix-env-python.patch + " provides="redo" provider_priority=50 @@ -39,4 +41,5 @@ cleanup_srcdir() { default_cleanup_srcdir } -sha512sums="41b8417136f98d12edf3c62f027f2459ae3fb92f6c5464553d79c3a52344de57220a5c64b565118da0a99c1544eaa153a468ffcdcfbf7193c76c896bcd40e900 redo-0.42.tar.gz" +sha512sums="8473bd8168c8e70b59a573560f8f725c8538061ee15eabeb63e467a363fa6869aa8088e8ce324726da4e2f7115e2ddf72cbb657703e9090f4f93c05f42bb67cb redo-0.42a.tar.gz +8b01a70e0812bf6c90c8447d110eac91639c35e3e3c20a083d4ed68fe0b3a3524081ad94fa1fd504525b7ebf5ef1fd5aff9fe3b933fe9f0aa2a404426ed96471 fix-env-python.patch" diff --git a/community/apenwarr-redo/fix-env-python.patch b/community/apenwarr-redo/fix-env-python.patch new file mode 100644 index 000000000000..49c59584c705 --- /dev/null +++ b/community/apenwarr-redo/fix-env-python.patch @@ -0,0 +1,50 @@ +diff --git a/docs/cookbook/container/default.sha256.do b/docs/cookbook/container/default.sha256.do +index d3007e9..b414d02 100644 +--- a/docs/cookbook/container/default.sha256.do ++++ b/docs/cookbook/container/default.sha256.do +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Calculate the sha256 digest of a given file.""" + import hashlib, os, subprocess, sys + +diff --git a/docs/cookbook/container/dockjson.py b/docs/cookbook/container/dockjson.py +index 11a4bec..133a55f 100755 +--- a/docs/cookbook/container/dockjson.py ++++ b/docs/cookbook/container/dockjson.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Generate a docker 1.0-style manifest for a docker image.""" + import json, os, sys, time + +diff --git a/docs/cookbook/container/fileids.py b/docs/cookbook/container/fileids.py +index 68d9982..667c54c 100755 +--- a/docs/cookbook/container/fileids.py ++++ b/docs/cookbook/container/fileids.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import hashlib, os, stat, sys + + for name in sys.stdin: +diff --git a/docs/cookbook/container/memcalc.py b/docs/cookbook/container/memcalc.py +index 2301874..7c43e11 100755 +--- a/docs/cookbook/container/memcalc.py ++++ b/docs/cookbook/container/memcalc.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + import os, sys + st = os.stat(sys.argv[1]) + megabytes = st.st_size // 1024 // 1024 +diff --git a/docs/cookbook/defaults/test.py b/docs/cookbook/defaults/test.py +index fa679d2..868cae5 100644 +--- a/docs/cookbook/defaults/test.py ++++ b/docs/cookbook/defaults/test.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """Test program for auto-generated version.py""" + import version + -- GitLab