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

[Chih-Hsuan Yen]

    Date: Monday, November 26, 2018 @ 23:22:06
  Author: yan12125
Revision: 409902

upgpkg: python-jsondiff 1.1.2-3

FS#60911

Modified:
  python-jsondiff/trunk/PKGBUILD

----------+
 PKGBUILD |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-11-26 23:06:21 UTC (rev 409901)
+++ PKGBUILD	2018-11-26 23:22:06 UTC (rev 409902)
@@ -4,7 +4,7 @@
 pkgname=python-jsondiff
 _pkgname=jsondiff
 pkgver=1.1.2
-pkgrel=2
+pkgrel=3
 pkgdesc='Diff JSON and JSON-like structures in Python'
 arch=(any)
 url='https://github.com/ZoomerAnalytics/jsondiff'
@@ -11,6 +11,8 @@
 license=(MIT)
 depends=(python-setuptools)
 checkdepends=(python-nose python-nose-random)
+# Both installs /usr/bin/jsondiff
+conflicts=(python-jsonpatch)
 source=("$pkgname-$pkgver.tar.gz"::"https://github.com/ZoomerAnalytics/jsondiff/archive/$pkgver.tar.gz")
 sha256sums=('8e5edaa604c4a96d9ffe7fea6f39ec91bdddaee78fae7c6ff91cbb8e105b70c1')