[arch-commits] Commit in ansible/repos/community-any (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Wed Mar 29 11:44:52 UTC 2017


    Date: Wednesday, March 29, 2017 @ 11:44:51
  Author: svenstaro
Revision: 219800

archrelease: copy trunk to community-any

Added:
  ansible/repos/community-any/0001-Revert-Add-jinja2-version-constraint.patch
    (from rev 219799, ansible/trunk/0001-Revert-Add-jinja2-version-constraint.patch)
  ansible/repos/community-any/PKGBUILD
    (from rev 219799, ansible/trunk/PKGBUILD)
Deleted:
  ansible/repos/community-any/0001-Revert-Add-jinja2-version-constraint.patch
  ansible/repos/community-any/PKGBUILD

-------------------------------------------------+
 0001-Revert-Add-jinja2-version-constraint.patch |   52 ++++-----
 PKGBUILD                                        |  127 ++++++++++------------
 2 files changed, 87 insertions(+), 92 deletions(-)

Deleted: 0001-Revert-Add-jinja2-version-constraint.patch
===================================================================
--- 0001-Revert-Add-jinja2-version-constraint.patch	2017-03-29 11:44:43 UTC (rev 219799)
+++ 0001-Revert-Add-jinja2-version-constraint.patch	2017-03-29 11:44:51 UTC (rev 219800)
@@ -1,26 +0,0 @@
-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
-

Copied: ansible/repos/community-any/0001-Revert-Add-jinja2-version-constraint.patch (from rev 219799, 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-03-29 11:44:51 UTC (rev 219800)
@@ -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-03-29 11:44:43 UTC (rev 219799)
+++ PKGBUILD	2017-03-29 11:44:51 UTC (rev 219800)
@@ -1,66 +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.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*
-}

Copied: ansible/repos/community-any/PKGBUILD (from rev 219799, ansible/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2017-03-29 11:44:51 UTC (rev 219800)
@@ -0,0 +1,61 @@
+# $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.2.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'
+            'python2-jmespath: json_query support')
+makedepends=('asciidoc' 'fakeroot' 'python' 'python2-setuptools'
+             'python-setuptools') 
+backup=('etc/ansible/ansible.cfg')
+source=("https://releases.ansible.com/ansible/ansible-${pkgver}.tar.gz")
+sha512sums=('e5d902e6c8d67c2b5e1e907dffab7a36505cc96a9748915dd8340f78b6bf5ced2efe2153f621ecceafc75750729d3e2e26c9c7c95b3a6d15838e6c36de8b8b60')
+
+prepare() {
+  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