--- a/PKGBUILD 2013-07-29 11:14:00.536666670 +0300 +++ b/PKGBUILD 2013-07-29 11:35:14.846657671 +0300 @@ -4,13 +4,13 @@ _pkgname=cjdns pkgname=${_pkgname}-git -pkgver=0.3.1188 +pkgver=0.3.1274 pkgrel=1 pkgdesc="A routing engine designed for security, scalability, speed and ease of use." url="https://github.com/cjdelisle/${_pkgname}" license="GPL3" -makedepends=('git') -optdepends=('python2: required by the python cjdnsadmin utilities') +makedepends=('git' 'python2' 'cmake') +depends=('python2') arch=('i686' 'x86_64' 'armv6h' 'armv7h') install=${pkgname}.install backup=("etc/default/${_pkgname}") @@ -57,9 +57,12 @@ _package_sysvinit() { install -D -m755 "${srcdir}"/${_pkgname}/scripts/${_pkgname}.sh "${pkgdir}"/usr/bin/${_pkgname}.sh } _package_pyutils() { - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/cjdnsadmin.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/cjdnsadmin.py - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/bencode.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/bencode.py - install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/__init__.py "${pkgdir}"/usr/lib/$(python2-config --libs | grep -o -E python2.*)/cjdnsadmin/__init__.py + pyutils_path=`python2 -c "import sys; print sys.path" | grep -oE "/\S+/site-packages'" | sed "s/'//"` + + install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/cjdnsadmin.py "${pkgdir}""${pyutils_path}"/cjdnsadmin/cjdnsadmin.py + install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/bencode.py "${pkgdir}""${pyutils_path}"/cjdnsadmin/bencode.py + install -D -m644 "${srcdir}"/${_pkgname}/contrib/python/cjdnsadmin/__init__.py "${pkgdir}""${pyutils_path}"/cjdnsadmin/__init__.py + install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/cjdnslog "${pkgdir}"/usr/bin/cjdns-log install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/dumptable "${pkgdir}"/usr/bin/cjdns-dumptable install -D -m755 "${srcdir}"/${_pkgname}/contrib/python/findnodes "${pkgdir}"/usr/bin/cjdns-findnodes