From 1dca1657a94fc17c9edc93805809370db22cd56a Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Wed, 25 Oct 2023 15:16:37 +0330 Subject: [PATCH 1/8] Remove commented depends --- ansible-cmdb/PKGBUILD | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index dff9e754..08e06536 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -8,7 +8,6 @@ arch=('any') url="https://github.com/fboender/ansible-cmdb" license=('GPL3') depends=('python' 'python-mako' 'python-pyyaml') -# depends=('python' 'python-mako' 'python-pyyaml' 'python-ushlex' 'python-jsonxs') makedepends=('python-setuptools') source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz") sha256sums=('8de9a02e3f0740967537850f6263756dca1bf506cd95c1f2ef7f4ee6d9ff23b8') From 7a9a7f0c3345788b217387d6bcf5f05f68b3e5de Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Sat, 28 Oct 2023 11:57:10 +0330 Subject: [PATCH 2/8] Use gardar branch with python-packaging 23.0 issue fix --- ansible-cmdb/.SRCINFO | 6 +++--- ansible-cmdb/PKGBUILD | 7 ++++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/ansible-cmdb/.SRCINFO b/ansible-cmdb/.SRCINFO index aef35cbd..09fbdd96 100644 --- a/ansible-cmdb/.SRCINFO +++ b/ansible-cmdb/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ansible-cmdb pkgdesc = Generate host overview from ansible fact gathering output. pkgver = 1.31 - pkgrel = 1 + pkgrel = 2 url = https://github.com/fboender/ansible-cmdb arch = any license = GPL3 @@ -9,7 +9,7 @@ pkgbase = ansible-cmdb depends = python depends = python-mako depends = python-pyyaml - source = ansible-cmdb-1.31-1.tar.gz::https://github.com/fboender/ansible-cmdb/archive/1.31.tar.gz - sha256sums = 8de9a02e3f0740967537850f6263756dca1bf506cd95c1f2ef7f4ee6d9ff23b8 + source = git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build + sha256sums = SKIP pkgname = ansible-cmdb diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index 08e06536..a1991e71 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -2,15 +2,16 @@ pkgname=ansible-cmdb pkgver=1.31 -pkgrel=1 +pkgrel=2 pkgdesc="Generate host overview from ansible fact gathering output." arch=('any') url="https://github.com/fboender/ansible-cmdb" license=('GPL3') depends=('python' 'python-mako' 'python-pyyaml') makedepends=('python-setuptools') -source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz") -sha256sums=('8de9a02e3f0740967537850f6263756dca1bf506cd95c1f2ef7f4ee6d9ff23b8') +# source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz") +source=("git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build") +sha256sums=('SKIP') build() { cd "$srcdir/${pkgname}-${pkgver}" From 2a67c06ec768cc547c02ce9411985650ed0046ca Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Sat, 28 Oct 2023 11:59:41 +0330 Subject: [PATCH 3/8] Add git to makedepends --- ansible-cmdb/.SRCINFO | 1 + ansible-cmdb/PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible-cmdb/.SRCINFO b/ansible-cmdb/.SRCINFO index 09fbdd96..2bd99e45 100644 --- a/ansible-cmdb/.SRCINFO +++ b/ansible-cmdb/.SRCINFO @@ -6,6 +6,7 @@ pkgbase = ansible-cmdb arch = any license = GPL3 makedepends = python-setuptools + makedepends = git depends = python depends = python-mako depends = python-pyyaml diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index a1991e71..f21054b9 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -8,7 +8,7 @@ arch=('any') url="https://github.com/fboender/ansible-cmdb" license=('GPL3') depends=('python' 'python-mako' 'python-pyyaml') -makedepends=('python-setuptools') +makedepends=('python-setuptools' 'git') # source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz") source=("git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build") sha256sums=('SKIP') From 0cb30950329cd573f7af64a42769827c67e94168 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Sat, 28 Oct 2023 12:07:02 +0330 Subject: [PATCH 4/8] Fix srcdir directory --- ansible-cmdb/PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index f21054b9..75e22ccb 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -14,12 +14,12 @@ source=("git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build") sha256sums=('SKIP') build() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${pkgname}" python setup.py build } package() { - cd "$srcdir/${pkgname}-${pkgver}" + cd "$srcdir/${pkgname}" PYTHONHASHSEED=0 python setup.py install --root="$pkgdir" --optimize=1 python setup.py install --root="$pkgdir/" --optimize=1 } From ffafc54aa880bc5688071a6771c3a9d62cec76aa Mon Sep 17 00:00:00 2001 From: gardar Date: Tue, 7 Nov 2023 13:17:46 +0000 Subject: [PATCH 5/8] fix: use build/install instead of setuptools invoking setup.py directly is deprecated: https://blog.ganssle.io/articles/2021/10/setup-py-deprecated.html --- ansible-cmdb/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index 75e22ccb..5c246a6a 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -8,18 +8,17 @@ arch=('any') url="https://github.com/fboender/ansible-cmdb" license=('GPL3') depends=('python' 'python-mako' 'python-pyyaml') -makedepends=('python-setuptools' 'git') +makedepends=('python-setuptools' 'git' 'python-build' 'python-installer' 'python-wheel') # source=("${pkgname}-${pkgver}-${pkgrel}.tar.gz::${url}/archive/${pkgver}.tar.gz") source=("git+https://github.com/gardar/ansible-cmdb.git#branch=fix-build") sha256sums=('SKIP') build() { cd "$srcdir/${pkgname}" - python setup.py build + python -m build } package() { cd "$srcdir/${pkgname}" - PYTHONHASHSEED=0 python setup.py install --root="$pkgdir" --optimize=1 - python setup.py install --root="$pkgdir/" --optimize=1 + python -m installer --destdir="$pkgdir" dist/*.whl } From d4cf2d02bdbdbb4791d8f950aed962d5262d8e3b Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Tue, 7 Nov 2023 17:12:39 +0330 Subject: [PATCH 6/8] Add gardar as Contributor --- ansible-cmdb/PKGBUILD | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index 5c246a6a..0a2f05d9 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -1,4 +1,5 @@ # Maintainer: Amin Vakil +# Contributor: gardar pkgname=ansible-cmdb pkgver=1.31 From 9d90e6c3a89b4064202b3dc31d260a428ee716a2 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Tue, 7 Nov 2023 17:13:45 +0330 Subject: [PATCH 7/8] Add new makedepends to .SRCINFO --- ansible-cmdb/.SRCINFO | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible-cmdb/.SRCINFO b/ansible-cmdb/.SRCINFO index 2bd99e45..ee3bed5a 100644 --- a/ansible-cmdb/.SRCINFO +++ b/ansible-cmdb/.SRCINFO @@ -7,6 +7,9 @@ pkgbase = ansible-cmdb license = GPL3 makedepends = python-setuptools makedepends = git + makedepends = python-build + makedepends = python-installer + makedepends = python-wheel depends = python depends = python-mako depends = python-pyyaml From 9ee8260e28208526eeaae131398e4b0dc933a356 Mon Sep 17 00:00:00 2001 From: Amin Vakil Date: Tue, 7 Nov 2023 17:15:19 +0330 Subject: [PATCH 8/8] Nitpicking :) --- ansible-cmdb/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-cmdb/PKGBUILD b/ansible-cmdb/PKGBUILD index 0a2f05d9..b136e889 100644 --- a/ansible-cmdb/PKGBUILD +++ b/ansible-cmdb/PKGBUILD @@ -21,5 +21,5 @@ build() { package() { cd "$srcdir/${pkgname}" - python -m installer --destdir="$pkgdir" dist/*.whl + python -m installer --destdir="$pkgdir" dist/*.whl }