Date: Friday, October 18, 2019 @ 17:38:19 Author: yan12125 Revision: 516894
upgpkg: buildbot-www 2.5.0-1 * Get rid of cicular dependency * Remove merged patch; see https://github.com/buildbot/buildbot/pull/5013 Modified: buildbot-www/trunk/PKGBUILD ----------+ PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-10-18 17:36:14 UTC (rev 516893) +++ PKGBUILD 2019-10-18 17:38:19 UTC (rev 516894) @@ -7,18 +7,16 @@ pkgname=(python-buildbot-www python-buildbot-waterfall-view python-buildbot-console-view python-buildbot-grid-view python-buildbot-wsgi-dashboards python-buildbot-badges) -pkgver=2.4.1 +pkgver=2.5.0 pkgrel=1 arch=(any) url='https://buildbot.net' license=(GPL2) -makedepends=(git buildbot=$pkgver python-buildbot-pkg=$pkgver python-mock) +makedepends=(git python-buildbot-pkg=$pkgver python-mock) checkdepends=(chromium) -source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig} - fix-re-tests.patch::https://github.com/buildbot/buildbot/commit/e3169c10e8dbde0536b4f1e45bf597012e8e69f3.patch) -sha256sums=('6237a4c61a6208324ca246b328ba01660fa40a40cce20430963b33901cd80672' - 'SKIP' - '24a0bc086508379e267e89494b316e1a3b1915e5c0d9ca55a44cb7bfe53acf75') +source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}) +sha256sums=('b5af824031c2bac87a73cd580fe597b439c113352f3f5d8c8146afbbf077fc77' + 'SKIP') validpgpkeys=( '390EB159056ED56F66AB1092AECD456B4D2531FC' # Pierre Tardy <[email protected]> (@tardyp on GitHub) 'FD0004A26EADFE43A4C3F249C6F7AE200374452D' # Povilas Kanapickas <[email protected]> (@p12tic on GitHub) @@ -29,7 +27,9 @@ # HACK: do not use virtualenv sed -i -e 's#frontend_deps:.*#frontend_deps:#' \ -e 's#frontend_tests_headless:.*#frontend_tests_headless:#' Makefile - patch -Np1 -i ../fix-re-tests.patch + # To avoid circular dependency + sed -i -e '/import buildbot/d' \ + -e "/setup_requires/ s#'buildbot', ##" www/*/setup.py } build() {
