summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD2
2 files changed, 5 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 80caa35c2f9f..677837f796b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jul 3 08:27:25 UTC 2017
+# Mon Jul 17 19:35:11 UTC 2017
pkgbase = python2-dulwich
pkgdesc = Pure-Python implementation of the Git file formats and protocols
pkgver = 0.17.2
@@ -15,7 +15,9 @@ pkgbase = python2-dulwich
pkgname = python2-dulwich
depends = python2
+ conflicts = python-dulwich
pkgname = python-dulwich
depends = python
+ conflicts = python2-dulwich
diff --git a/PKGBUILD b/PKGBUILD
index 97dfa3f69a28..8cc5d86993b6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -22,12 +22,14 @@ build() {
package_python-dulwich() {
depends=('python')
+ conflicts=('python2-dulwich')
cd "dulwich-${pkgver}"
python setup.py install --root="$pkgdir/" --skip-build --optimize=1
}
package_python2-dulwich() {
depends=('python2')
+ conflicts=('python-dulwich')
cd "dulwich-${pkgver}"
python2 setup.py install --root="$pkgdir/" --skip-build --optimize=1
}