[arch-commits] Commit in ansible/trunk (PKGBUILD)

[Sven-Hendrik Haase]

    Date: Sunday, May 20, 2018 @ 18:20:33
  Author: svenstaro
Revision: 325503

upgpkg: ansible 2.5.3-2

Remove separate python-ansible

Modified:
  ansible/trunk/PKGBUILD

----------+
 PKGBUILD |   20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-20 18:20:00 UTC (rev 325502)
+++ PKGBUILD	2018-05-20 18:20:33 UTC (rev 325503)
@@ -6,14 +6,17 @@
 # Contributor: m0ikz <ndelatorre at moikz.com.ar>
 # Contributor: atweiden <archbaum at gmail.com>
 
-pkgname=(ansible python-ansible)
+pkgname=ansible
 pkgver=2.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc='Radically simple IT automation platform'
 arch=('any')
 url='https://www.ansible.com'
 license=('GPL3')
 depends=('python' 'python-yaml' 'python-paramiko' 'python-jinja' 'python-crypto')
+provides=('python-ansible')
+replaces=('python-ansible')
+conflicts=('python-ansible')
 optdepends=('sshpass: for ssh connections with password'
             'python-passlib: crypt values for vars_prompt'
             'python-pyopenssl: openssl modules'
@@ -42,9 +45,7 @@
   python setup.py build
 }
 
-package_ansible() {
-  provides=('python-ansible')
-
+package() {
   cd ${pkgname}-${pkgver}
   python setup.py install -O1 --root="${pkgdir}"
   install -Dm644 COPYING "${pkgdir}"/usr/share/doc/ansible/COPYING
@@ -56,12 +57,3 @@
   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*
-}