summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Dvoretsky2017-05-04 00:53:31 +0300
committerEugene Dvoretsky2017-05-04 00:53:31 +0300
commitdd850979b94c05ded7e15882318185fb4210d142 (patch)
tree570cba99cf38574b4567163f91f9974c2c77e85f
parent4e2faa0e436f2b5eee2e79e97b3e6fda829bf361 (diff)
downloadaur-dd850979b94c05ded7e15882318185fb4210d142.tar.gz
Replaces instead conflicts
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 3 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f7b41baf59c..ea45c7d9b6aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Wed May 3 18:44:56 UTC 2017
+# Wed May 3 21:53:05 UTC 2017
pkgbase = python2-pylibtiff-git
pkgdesc = A python wrapper of the C libtiff library
pkgver = r138.33735eb
@@ -14,7 +14,7 @@ pkgbase = python2-pylibtiff-git
depends = libtiff
provides = python2-libtiff
provides = python2-pylibtiff
- conflicts = python2-libtiff-svn
+ replaces = python2-libtiff-svn
source = python2-pylibtiff::git+https://github.com/pearu/pylibtiff.git
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 416b4cc30f87..9be7063baf08 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -10,7 +10,7 @@ license=('BSD')
depends=('python2-numpy' 'libtiff')
makedepends=('python2-setuptools' 'git')
provides=('python2-libtiff' 'python2-pylibtiff')
-conflicts=('python2-libtiff-svn')
+replaces=('python2-libtiff-svn')
source=("${pkgname%-git}::git+https://github.com/pearu/pylibtiff.git")
sha256sums=('SKIP')