ansible-core: update to 2.13.5.

This commit is contained in:
Jan Christian Grünhage 2022-10-17 13:52:03 +02:00 committed by Michal Vasilek
parent 8574e51953
commit c482f25d45
2 changed files with 3 additions and 35 deletions

View File

@ -1,32 +0,0 @@
From 7e4b82ed9506e189c9060e3987e68c40e60bfaed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Christian=20Gr=C3=BCnhage?=
<jan.christian@gruenhage.xyz>
Date: Thu, 30 Jun 2022 15:33:46 +0200
Subject: [PATCH] use 'command -v' instead of 'which' in Makefile
'which' is not standardized and can even be considered problematic [1]
[1] https://lwn.net/Articles/874049/
---
Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile b/Makefile
index 7641344968..45421e88e0 100644
--- a/Makefile
+++ b/Makefile
@@ -18,9 +18,9 @@ SDIST_DIR ?= 'dist'
# This doesn't evaluate until it's called. The -D argument is the
# directory of the target file ($@), kinda like `dirname`.
MANPAGES ?= $(patsubst %.rst.in,%,$(wildcard ./docs/man/man1/ansible*.1.rst.in))
-ifneq ($(shell which rst2man 2>/dev/null),)
+ifneq ($(shell command -v rst2man 2>/dev/null),)
ASCII2MAN = rst2man $< $@
-else ifneq ($(shell which rst2man.py 2>/dev/null),)
+else ifneq ($(shell command -v rst2man.py 2>/dev/null),)
ASCII2MAN = rst2man.py $< $@
else
ASCII2MAN = @echo "ERROR: rst2man from docutils command is not installed but is required to build $(MANPAGES)" && exit 1
--
2.37.1

View File

@ -1,7 +1,7 @@
# Template file for 'ansible-core'
pkgname=ansible-core
version=2.13.4
revision=2
version=2.14.0
revision=1
hostmakedepends="python3-setuptools python3-wheel python3-packaging
python3-straight.plugin python3-docutils python3-Jinja2 python3-yaml"
depends="python3-cryptography python3-Jinja2 python3-paramiko python3-yaml
@ -14,7 +14,7 @@ license="GPL-3.0-or-later"
homepage="https://www.ansible.com/"
changelog="https://raw.githubusercontent.com/ansible/ansible/stable-${version%.*}/changelogs/CHANGELOG-v${version%.*}.rst"
distfiles="${PYPI_SITE}/a/ansible-core/ansible-core-${version}.tar.gz"
checksum=78f45c2c472af60b9b4b8cbdaba5a3911079087891a9f6c6ed726327b8f21c6a
checksum=fa48b481cb623bf79bb903f223097681a0c13e1b4ec7e78e7dd7d858d36a34b2
conflicts="ansible<2.10.1_1"
replaces="ansible-base<2.11.0_1"