Date: Monday, January 16, 2017 @ 18:14:42 Author: bpiotrowski Revision: 207623
2.2.1.0-1: new upstream release; revert patch constraining jinja2 to < 2.9 Added: ansible/trunk/0001-Revert-Add-jinja2-version-constraint.patch Modified: ansible/trunk/PKGBUILD -------------------------------------------------+ 0001-Revert-Add-jinja2-version-constraint.patch | 26 +++++++++++++++++++ PKGBUILD | 29 ++++++++++++---------- 2 files changed, 43 insertions(+), 12 deletions(-) Added: 0001-Revert-Add-jinja2-version-constraint.patch =================================================================== --- 0001-Revert-Add-jinja2-version-constraint.patch (rev 0) +++ 0001-Revert-Add-jinja2-version-constraint.patch 2017-01-16 18:14:42 UTC (rev 207623) @@ -0,0 +1,26 @@ +From 3ddaf071d38cf6f1ea2bfdd80cb5de0f549d158c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <[email protected]> +Date: Mon, 16 Jan 2017 19:09:30 +0100 +Subject: [PATCH] Revert "Add jinja2 version constraint." + +This reverts commit 06ed25e788a3324214ee3226ca35b5586ee83344. +--- + setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/setup.py b/setup.py +index 0eec3da0b..ef7aa3dad 100644 +--- a/setup.py ++++ b/setup.py +@@ -22,7 +22,7 @@ setup(name='ansible', + license='GPLv3', + # Ansible will also make use of a system copy of python-six if installed but use a + # Bundled copy if it's not. +- install_requires=['paramiko', 'jinja2 < 2.9', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], ++ install_requires=['paramiko', 'jinja2', "PyYAML", 'setuptools', 'pycrypto >= 2.6'], + package_dir={ '': 'lib' }, + packages=find_packages('lib'), + package_data={ +-- +2.11.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-01-16 13:55:38 UTC (rev 207622) +++ PKGBUILD 2017-01-16 18:14:42 UTC (rev 207623) @@ -7,10 +7,8 @@ # Contributor: atweiden <[email protected]> pkgname=(ansible python-ansible) -pkgver=2.2.1.0rc5 -_pkgver1=2.2.1.0 -_pkgver2=2.2.1.0-0.5.rc5 -pkgrel=3 +pkgver=2.2.1.0 +pkgrel=1 pkgdesc='Radically simple IT automation platform' arch=('any') url='http://www.ansible.com' @@ -19,20 +17,27 @@ optdepends=('python2-passlib: crypt values for vars_prompt' 'python2-netaddr: for the ipaddr filter' 'python2-systemd: log to journal') -makedepends=('asciidoc' 'fakeroot' 'python' 'python-setuptools' 'python2-setuptools') +makedepends=('asciidoc' 'fakeroot' 'python' 'python2-setuptools' + 'python-setuptools') backup=('etc/ansible/ansible.cfg') -source=("https://releases.ansible.com/ansible/ansible-${_pkgver2}.tar.gz";) -sha512sums=('5e2078181e54e6713ea0674fa7c6334023e65354334c192f19945631e4215cf8cc871e93f3e1c2af411c053c4185f3e6ba81f24c0ee7b59d75c9144fa7500f5b') +source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz"; + 0001-Revert-Add-jinja2-version-constraint.patch) +sha512sums=('10f90f4ac68215febd14e36fa9ea3b2156677f2b7a29a08633e0702bcbd8a7c3551980deeabcff756380b076ac7ba6a5e9eca07af66d908d8d6627390744bc00' + 'e2eb3a070840984ad7539ba81cd85810b2226d43642dd7b5b0232b85d31294cbc1e370b85d3ec3d7f321b113395606cefb58d0968ef66ccf23020e51786da7b1') prepare() { - cp -r ${pkgname}-${_pkgver1} "${srcdir}"/${pkgname}-${_pkgver1}-python + pushd ${pkgname}-${pkgver} + patch -p1 -i "${srcdir}"/0001-Revert-Add-jinja2-version-constraint.patch + popd + + cp -r ${pkgname}-${pkgver} "${srcdir}"/${pkgname}-${pkgver}-python } build() { - cd "${srcdir}"/${pkgname}-${_pkgver1} + cd "${srcdir}"/${pkgname}-${pkgver} python2 setup.py build - cd "${srcdir}"/${pkgname}-${_pkgver1}-python + cd "${srcdir}"/${pkgname}-${pkgver}-python python setup.py build } @@ -39,7 +44,7 @@ package_ansible() { provides=('python2-ansible') - cd ${pkgname}-${_pkgver1} + cd ${pkgname}-${pkgver} python2 setup.py install -O1 --root="${pkgdir}" install -Dm644 COPYING "${pkgdir}"/usr/share/doc/ansible/COPYING @@ -55,7 +60,7 @@ pkgdesc='python bindings for ansible' depends=('python-paramiko' 'python-jinja' 'python-yaml' 'python-crypto') - cd "${srcdir}"/ansible-${_pkgver1}-python + cd "${srcdir}"/ansible-${pkgver}-python python setup.py install --root=${pkgdir} --optimize=1 rm "${pkgdir}"/usr/bin/ansible* }
