Date: Saturday, August 7, 2021 @ 10:47:47 Author: yan12125 Revision: 994641
upgpkg: nvchecker 2.4-2; refresh the backported patch for dependencies and fix check() Modified: nvchecker/trunk/PKGBUILD ----------+ PKGBUILD | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-08-07 10:26:43 UTC (rev 994640) +++ PKGBUILD 2021-08-07 10:47:47 UTC (rev 994641) @@ -5,17 +5,18 @@ pkgver=2.4 # git rev-parse v$pkgver _commit=f89ebe4e43c45e95a5b4cbcf58f23d81a616c12f -pkgrel=1 +pkgrel=2 pkgdesc="New version checker for software releases" arch=('any') url="https://github.com/lilydjwg/nvchecker" license=('MIT') -depends=('python' 'python-toml' 'python-structlog' 'python-appdirs' 'python-tornado' 'python-pycurl' 'python-packaging') +depends=('python' 'python-toml' 'python-structlog' 'python-appdirs' 'python-tornado' 'python-pycurl') makedepends=('git' 'python-docutils' 'python-setuptools' 'python-pygments') checkdepends=('python-pytest' 'python-pytest-asyncio' 'python-pytest-httpbin' 'python-flaky' 'python-lxml' 'pyalpm' 'git') optdepends=( 'pyalpm: for using "sort_version_key = vercmp" in configuration files and the alpm source' 'python-lxml: for the htmlparser source' + 'python-packaging: for the pypi source' 'git: support for git repositories' 'python-gobject: for nvchecker-notify' 'libnotify: for nvchecker-notify' @@ -29,11 +30,25 @@ '356690A1E7404E30D0E902B2E64D049594A54F54' ) +_backports=( + # cleanup dependencies and update setup.py + 02515fc82d3be563937bb98b5625fc7fb99c35f7 + # anitya: relax the test - shutter is updated often these days + 44b9f1856fbc68c58ae76840c2e14c3dddd8b22e +) + prepare() { cd nvchecker - # https://github.com/lilydjwg/nvchecker/pull/197 - # Remove no longer needed setuptools dependency - git cherry-pick -n 3fdb2ee9d484d458a40024e83648e8b04c6a6e49 + + # this loop is stolen from core/systemd :) + local _c + for _c in "${_backports[@]}"; do + git log --oneline -1 "${_c}" + git cherry-pick -n "${_c}" + done + + # revert the version changed in 02515fc82d3be563937bb98b5625fc7fb99c35f7 + sed -i "s#__version__.*#__version__ = '$pkgver'#" nvchecker/__init__.py } build() {