[arch-commits] Commit in ansible/repos/community-any (3 files)
Bartłomiej Piotrowski
bpiotrowski at archlinux.org
Mon Jan 16 18:14:58 UTC 2017
Date: Monday, January 16, 2017 @ 18:14:58
Author: bpiotrowski
Revision: 207624
archrelease: copy trunk to community-any
Added:
ansible/repos/community-any/0001-Revert-Add-jinja2-version-constraint.patch
(from rev 207623, ansible/trunk/0001-Revert-Add-jinja2-version-constraint.patch)
ansible/repos/community-any/PKGBUILD
(from rev 207623, ansible/trunk/PKGBUILD)
Deleted:
ansible/repos/community-any/PKGBUILD
-------------------------------------------------+
0001-Revert-Add-jinja2-version-constraint.patch | 26 ++++
PKGBUILD | 127 +++++++++++-----------
2 files changed, 92 insertions(+), 61 deletions(-)
Copied: ansible/repos/community-any/0001-Revert-Add-jinja2-version-constraint.patch (from rev 207623, ansible/trunk/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:58 UTC (rev 207624)
@@ -0,0 +1,26 @@
+From 3ddaf071d38cf6f1ea2bfdd80cb5de0f549d158c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Bart=C5=82omiej=20Piotrowski?= <bpiotrowski at archlinux.org>
+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
+
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2017-01-16 18:14:42 UTC (rev 207623)
+++ PKGBUILD 2017-01-16 18:14:58 UTC (rev 207624)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
-# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Chris <seitz.christoph at gmail.com>
-# Contributor: m0ikz <ndelatorre at moikz.com.ar>
-# Contributor: atweiden <archbaum at gmail.com>
-
-pkgname=(ansible python-ansible)
-pkgver=2.2.1.0rc5
-_pkgver1=2.2.1.0
-_pkgver2=2.2.1.0-0.5.rc5
-pkgrel=3
-pkgdesc='Radically simple IT automation platform'
-arch=('any')
-url='http://www.ansible.com'
-license=('GPL3')
-depends=('python2' 'python2-yaml' 'python2-paramiko' 'python2-jinja' 'python2-crypto')
-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')
-backup=('etc/ansible/ansible.cfg')
-source=("https://releases.ansible.com/ansible/ansible-${_pkgver2}.tar.gz")
-sha512sums=('5e2078181e54e6713ea0674fa7c6334023e65354334c192f19945631e4215cf8cc871e93f3e1c2af411c053c4185f3e6ba81f24c0ee7b59d75c9144fa7500f5b')
-
-prepare() {
- cp -r ${pkgname}-${_pkgver1} "${srcdir}"/${pkgname}-${_pkgver1}-python
-}
-
-build() {
- cd "${srcdir}"/${pkgname}-${_pkgver1}
- python2 setup.py build
-
- cd "${srcdir}"/${pkgname}-${_pkgver1}-python
- python setup.py build
-}
-
-package_ansible() {
- provides=('python2-ansible')
-
- cd ${pkgname}-${_pkgver1}
- python2 setup.py install -O1 --root="${pkgdir}"
- install -Dm644 COPYING "${pkgdir}"/usr/share/doc/ansible/COPYING
-
- install -d "${pkgdir}"/usr/share/ansible/doc
- cp -dpr --no-preserve=ownership ./examples "${pkgdir}"/usr/share/ansible/doc/
- install -Dm644 examples/ansible.cfg "${pkgdir}"/etc/ansible/ansible.cfg
-
- install -d "${pkgdir}"/usr/share/man/man1
- cp -dpr --no-preserve=ownership docs/man/man1/*.1 "${pkgdir}"/usr/share/man/man1
-}
-
-package_python-ansible() {
- pkgdesc='python bindings for ansible'
- depends=('python-paramiko' 'python-jinja' 'python-yaml' 'python-crypto')
-
- cd "${srcdir}"/ansible-${_pkgver1}-python
- python setup.py install --root=${pkgdir} --optimize=1
- rm "${pkgdir}"/usr/bin/ansible*
-}
Copied: ansible/repos/community-any/PKGBUILD (from rev 207623, ansible/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2017-01-16 18:14:58 UTC (rev 207624)
@@ -0,0 +1,66 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: Bartłomiej Piotrowski <bpiotrowski at archlinux.org>
+# Contributor: Daniel Wallace <danielwallace at gtmanfred dot com>
+# Contributor: Chris <seitz.christoph at gmail.com>
+# Contributor: m0ikz <ndelatorre at moikz.com.ar>
+# Contributor: atweiden <archbaum at gmail.com>
+
+pkgname=(ansible python-ansible)
+pkgver=2.2.1.0
+pkgrel=1
+pkgdesc='Radically simple IT automation platform'
+arch=('any')
+url='http://www.ansible.com'
+license=('GPL3')
+depends=('python2' 'python2-yaml' 'python2-paramiko' 'python2-jinja' 'python2-crypto')
+optdepends=('python2-passlib: crypt values for vars_prompt'
+ 'python2-netaddr: for the ipaddr filter'
+ 'python2-systemd: log to journal')
+makedepends=('asciidoc' 'fakeroot' 'python' 'python2-setuptools'
+ 'python-setuptools')
+backup=('etc/ansible/ansible.cfg')
+source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz"
+ 0001-Revert-Add-jinja2-version-constraint.patch)
+sha512sums=('10f90f4ac68215febd14e36fa9ea3b2156677f2b7a29a08633e0702bcbd8a7c3551980deeabcff756380b076ac7ba6a5e9eca07af66d908d8d6627390744bc00'
+ 'e2eb3a070840984ad7539ba81cd85810b2226d43642dd7b5b0232b85d31294cbc1e370b85d3ec3d7f321b113395606cefb58d0968ef66ccf23020e51786da7b1')
+
+prepare() {
+ 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}-${pkgver}
+ python2 setup.py build
+
+ cd "${srcdir}"/${pkgname}-${pkgver}-python
+ python setup.py build
+}
+
+package_ansible() {
+ provides=('python2-ansible')
+
+ cd ${pkgname}-${pkgver}
+ python2 setup.py install -O1 --root="${pkgdir}"
+ install -Dm644 COPYING "${pkgdir}"/usr/share/doc/ansible/COPYING
+
+ install -d "${pkgdir}"/usr/share/ansible/doc
+ cp -dpr --no-preserve=ownership ./examples "${pkgdir}"/usr/share/ansible/doc/
+ install -Dm644 examples/ansible.cfg "${pkgdir}"/etc/ansible/ansible.cfg
+
+ install -d "${pkgdir}"/usr/share/man/man1
+ cp -dpr --no-preserve=ownership docs/man/man1/*.1 "${pkgdir}"/usr/share/man/man1
+}
+
+package_python-ansible() {
+ pkgdesc='python bindings for ansible'
+ depends=('python-paramiko' 'python-jinja' 'python-yaml' 'python-crypto')
+
+ cd "${srcdir}"/ansible-${pkgver}-python
+ python setup.py install --root=${pkgdir} --optimize=1
+ rm "${pkgdir}"/usr/bin/ansible*
+}
More information about the arch-commits
mailing list