1 files changed, 17 insertions, 26 deletions
diff --git a/pcr/pypolicyd-spf/PKGBUILD b/pcr/pypolicyd-spf/PKGBUILD
index bc7d710b7..72d333af2 100644
--- a/pcr/pypolicyd-spf/PKGBUILD
+++ b/pcr/pypolicyd-spf/PKGBUILD
@@ -1,52 +1,43 @@
 # Maintainer: Luke Shumaker <lukeshu@parabola.nu>
-# Maintainer (AUR:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com>
-# Maintainer (AUR:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com>
-# Contributor (AUR): Samed Beyribey <ras0ir@eventualis.org>
+# Maintainer (aur:python-postfix-policyd-spf): Hao Zhang theivorytower [at] gmail [dot] com>
+# Maintainer (aur:python2-postfix-policyd-spf): Filip S. Adamsen <fsa [at] fsadev [dot] com>
+# Contributor: Samed Beyribey <ras0ir@eventualis.org>
 
 pkgname=pypolicyd-spf
 pkgver=2.0.2
 _pkgver=${pkgver%.*}
-pkgrel=4
+pkgrel=5
 pkgdesc="Python Postfix Sender Policy Framework (SPF) filter daemon"
 arch=('any')
 url="https://launchpad.net/${pkgname}/"
 license=('GPL')
 
 makedepends=('python-setuptools')
-depends=('postfix' 'python-pyspf' 'python')
+depends=('postfix' 'python-pyspf')
 optdepends=('python-authres: RFC 7001 Authentication-Results header support')
 
 options=(!emptydirs)
 backup=(etc/python-policyd-spf/policyd-spf.conf)
 
-source=(https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz{,.asc})
+source=("https://launchpad.net/$pkgname/${_pkgver}/$pkgver/+download/$pkgname-$pkgver.tar.gz"{,.asc})
 md5sums=('cc50281cc13a8984de058ddc5ae8dcaf'
          'SKIP')
 validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman
 
-
-_version_constraint() # (dep_pkgname)
-{
-  local dep_pkgname=$1
-  local version=$(pacman -S --print-format='%v' ${dep_pkgname} | tail -n 1)
-  version=${version%-*}
-  local version_inc=${version%.*}.$(( ${version##*.} + 1 ))
-
-  echo -n "${dep_pkgname}>=${version}" "${dep_pkgname}<${version_inc}"
-}
-
-
 build() {
-  cd "$srcdir"/$pkgname-$pkgver
-
-  python setup.py build || return 1
+  cd "$pkgname-$pkgver"
+  # Don't use build a modern 'wheel' instead of 'egg' (and so don't
+  # use modern 'python-builder' and 'python-installer').  The way
+  # setup.py is written, the 'wheel' will be broken and won't
+  # correctly install files in '/etc'.
+  python setup.py build
 }
 
 package() {
-  depends+=( $(_version_constraint 'python') )
-
-  cd "$srcdir"/$pkgname-$pkgver
+  _python_version=$(pacman -S --print-format='%v' python|cut -d- -f1|cut -d. -f1,2)
+  depends+=("python>=${_python_version}" "python<${_python_version%.*}.$(( ${_python_version##*.} + 1 ))")
 
-  python setup.py install --root="$pkgdir/" --optimize=1 || return 1
-  install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf || return 1
+  cd "$pkgname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -m644 policyd-spf.conf.commented "$pkgdir"/etc/python-policyd-spf
 }