Date: Sunday, June 23, 2019 @ 16:17:02 Author: yan12125 Revision: 483138
upgpkg: python-jsondiff 1.2.0-1 The conflict with python-jsonpatch (/usr/bin/jsondiff) is resolved :) Modified: python-jsondiff/trunk/PKGBUILD ----------+ PKGBUILD | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2019-06-23 15:59:03 UTC (rev 483137) +++ PKGBUILD 2019-06-23 16:17:02 UTC (rev 483138) @@ -3,16 +3,16 @@ pkgname=python-jsondiff _pkgname=jsondiff -pkgver=1.1.2 -pkgrel=4 +pkgver=1.2.0 +pkgrel=1 pkgdesc='Diff JSON and JSON-like structures in Python' arch=(any) -url='https://github.com/ZoomerAnalytics/jsondiff' +url='https://github.com/xlwings/jsondiff' license=(MIT) -depends=(python) +depends=(python python-setuptools) checkdepends=(python-nose python-nose-random) -source=("$pkgname-$pkgver.tar.gz"::"https://github.com/ZoomerAnalytics/jsondiff/archive/$pkgver.tar.gz";) -sha256sums=('8e5edaa604c4a96d9ffe7fea6f39ec91bdddaee78fae7c6ff91cbb8e105b70c1') +source=("https://github.com/xlwings/jsondiff/archive/v$pkgver/jsondiff-v$pkgver.tar.gz";) +sha256sums=('445b2d519c006e0ba10e1a71f596b7cb3f5d3c62849f3b9a6780b5e9653da92f') build() { cd $_pkgname-$pkgver @@ -28,6 +28,6 @@ cd $_pkgname-$pkgver python setup.py install --root="$pkgdir" --optimize=1 --skip-build install -Dm644 LICENSE -t "$pkgdir"/usr/share/licenses/$pkgname - # FS#60911 - rm -r "$pkgdir"/usr/bin + # FS#60911, https://github.com/xlwings/jsondiff/issues/24 + rm "$pkgdir"/usr/bin/jsondiff }
