summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authordrrossum2017-11-16 08:25:29 +0100
committerdrrossum2017-11-16 08:25:29 +0100
commit7fc92ea060159eaf65e7bd914daa5639c27bfc1c (patch)
tree48248a0415730c74fd4ce50dfa1c77d97e176dc0
parent18371704bcf9f4d5155daef4bd0331d3adc72a5d (diff)
downloadaur-7fc92ea060159eaf65e7bd914daa5639c27bfc1c.tar.gz
fix makedepends and rename python2-dulwich binaries to avoid conflict with python-dulwich package
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD12
2 files changed, 10 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 607b30f93bbf..a6578490eefd 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,21 @@
# Generated by mksrcinfo v8
-# Tue Oct 31 09:18:10 UTC 2017
+# Thu Nov 16 07:24:27 UTC 2017
pkgbase = python2-dulwich
pkgdesc = Pure-Python implementation of the Git file formats and protocols
pkgver = 0.18.5
- pkgrel = 1
+ pkgrel = 2
url = https://www.dulwich.io/
arch = any
license = GPL2
+ makedepends = python2
+ makedepends = python
options = !emptydirs
source = https://github.com/jelmer/dulwich/archive/dulwich-0.18.5.tar.gz
md5sums = d20dbdb2ec7a1ae6570bb446cce70f7b
pkgname = python2-dulwich
depends = python2
- conflicts = python-dulwich
pkgname = python-dulwich
depends = python
- conflicts = python2-dulwich
diff --git a/PKGBUILD b/PKGBUILD
index ee4338d04dbe..7dd65266f4e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,15 +2,16 @@
pkgname=(python2-dulwich python-dulwich)
pkgver=0.18.5
-pkgrel=1
+pkgrel=2
pkgdesc='Pure-Python implementation of the Git file formats and protocols'
arch=('any')
url='https://www.dulwich.io/'
license=('GPL2')
depends=()
+makedepends=('python2' 'python')
options=(!emptydirs)
source=("https://github.com/jelmer/dulwich/archive/dulwich-${pkgver}.tar.gz")
-
+md5sums=('d20dbdb2ec7a1ae6570bb446cce70f7b')
build() {
cd "dulwich-dulwich-${pkgver}"
@@ -20,18 +21,17 @@ build() {
package_python-dulwich() {
depends=('python')
- conflicts=('python2-dulwich')
cd "dulwich-dulwich-${pkgver}"
python setup.py install --root="$pkgdir/" --skip-build --optimize=1
}
package_python2-dulwich() {
depends=('python2')
- conflicts=('python-dulwich')
cd "dulwich-dulwich-${pkgver}"
python2 setup.py install --root="$pkgdir/" --skip-build --optimize=1
+ mv "${pkgdir}"/usr/bin/dulwich{,2}
+ mv "${pkgdir}"/usr/bin/dul-receive-pack{,2}
+ mv "${pkgdir}"/usr/bin/dul-upload-pack{,2}
}
# vim:set ts=2 sw=2 et:
-
-md5sums=('d20dbdb2ec7a1ae6570bb446cce70f7b')