Update to 3.0.0

2 files changed, 35 insertions, 38 deletions

diff --git a/.SRCINFO b/.SRCINFO
index eb774a41bc53..c4dc5bce505b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,17 @@
 pkgbase = python-spf-engine
-	pkgdesc = SPF (Sender Policy Framework) back-end for integration with Postfix and Sendmail
-	pkgver = 2.9.3
-	pkgrel = 2
+	pkgdesc = SPF (Sender Policy Framework) back-end for Postfix and Sendmail
+	pkgver = 3.0.0
+	pkgrel = 1
 	url = https://launchpad.net/spf-engine
 	arch = any
 	license = Apache
 	license = GPL2
 	makedepends = python-build
+	makedepends = python-flit
 	makedepends = python-installer
-	makedepends = python-setuptools
 	makedepends = python-wheel
 	depends = python-authres
-	depends = python-pymilter
+	depends = python-pymilter>=1.0.5
 	depends = python-pyspf>=2.0.9
 	optdepends = postfix: Postfix integration
 	optdepends = sendmail: Sendmail integration
@@ -20,16 +20,12 @@ pkgbase = python-spf-engine
 	conflicts = spf-engine
 	backup = etc/python-policyd-spf/policyd-spf.conf
 	backup = etc/pyspf-milter/pyspf-milter.conf
-	source = https://launchpad.net/spf-engine/2.9/2.9.3/+download/spf-engine-2.9.3.tar.gz
-	source = https://launchpad.net/spf-engine/2.9/2.9.3/+download/spf-engine-2.9.3.tar.gz.asc
+	source = https://launchpad.net/spf-engine/3.0/3.0.0/+download/spf-engine-3.0.0.tar.gz
+	source = https://launchpad.net/spf-engine/3.0/3.0.0/+download/spf-engine-3.0.0.tar.gz.asc
 	source = pyspf-milter.sysusers
-	source = pyspf-milter.conf
-	source = pyspf-milter.service
 	validpgpkeys = E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1
-	sha512sums = adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528
+	sha512sums = c380270244ec05758a171f01fd8f78f1464f249eefda1eecd083fc072e456f28fe6548819fd9391506088f035b9f4868d4b65d1c6e5eb685925ef0bf4074c4d8
 	sha512sums = SKIP
 	sha512sums = 8cc1cd34e106de3b71e1072b79d8e74a4d38a5a48e9fbf00e432c83fe3d81fa7b82908f087cc51e9c268af9066364cdb86daed66579bd93239f2ceeb7b24be74
-	sha512sums = da291074a2ee69ebdf62b8411a1653da7e4898338ad448804fea587be7e1b96dbfc950a700e0be186eaee2377fb6a2df76ceba827b4377db7bed4de0202f559d
-	sha512sums = dbb83aa1dc61cf4219f6d2072c34e00416783446c630a2b09db94333f1ed97936fa8a8ecda8e497cca2f7e429f8bba0ee4e67d66753ac72e7b1d49b893aa0342
 
 pkgname = python-spf-engine
diff --git a/PKGBUILD b/PKGBUILD
index 9a4d938396a8..69dad385af45 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,19 @@
 # Maintainer: Morgenstern <charles [at] charlesbwise [dot] com> 
 
 pkgname=python-spf-engine
-#_pkgname="${pkgname#*-}"
-pkgver=2.9.3
-#_pkgver=2.9
-pkgrel=2
-pkgdesc="SPF (Sender Policy Framework) back-end for integration with Postfix and Sendmail"
+pkgver=3.0.0
+pkgrel=1
+pkgdesc="SPF (Sender Policy Framework) back-end for Postfix and Sendmail"
 arch=('any')
 url="https://launchpad.net/${pkgname#*-}"
 license=('Apache'
          'GPL2')
 depends=('python-authres'
-         'python-pymilter'
+         'python-pymilter>=1.0.5'
          'python-pyspf>=2.0.9')
 makedepends=('python-build'
+             'python-flit'
              'python-installer'
-             'python-setuptools'
              'python-wheel')
 optdepends=('postfix: Postfix integration'
             'sendmail: Sendmail integration') 
@@ -25,36 +23,39 @@ conflicts=('python-postfix-policyd-spf'
 backup=(etc/python-policyd-spf/policyd-spf.conf
         etc/pyspf-milter/pyspf-milter.conf)
 source=("${url}/${pkgver%.*}/${pkgver}/+download/${pkgname#*-}-${pkgver}.tar.gz"{,.asc}
-        pyspf-milter.sysusers
-        pyspf-milter.conf
-        pyspf-milter.service)
-sha512sums=('adde80eca38f372ad00ed7355951007b9c02ef8a52a5a4edcbf2fa9959220f1083e3e313668e9c7ad2c26144148ae8ff62ec468d79936d96b43897598254f528'
+        pyspf-milter.sysusers)
+sha512sums=('c380270244ec05758a171f01fd8f78f1464f249eefda1eecd083fc072e456f28fe6548819fd9391506088f035b9f4868d4b65d1c6e5eb685925ef0bf4074c4d8'
             'SKIP'
-            '8cc1cd34e106de3b71e1072b79d8e74a4d38a5a48e9fbf00e432c83fe3d81fa7b82908f087cc51e9c268af9066364cdb86daed66579bd93239f2ceeb7b24be74'
-            'da291074a2ee69ebdf62b8411a1653da7e4898338ad448804fea587be7e1b96dbfc950a700e0be186eaee2377fb6a2df76ceba827b4377db7bed4de0202f559d'
-            'dbb83aa1dc61cf4219f6d2072c34e00416783446c630a2b09db94333f1ed97936fa8a8ecda8e497cca2f7e429f8bba0ee4e67d66753ac72e7b1d49b893aa0342')
+            '8cc1cd34e106de3b71e1072b79d8e74a4d38a5a48e9fbf00e432c83fe3d81fa7b82908f087cc51e9c268af9066364cdb86daed66579bd93239f2ceeb7b24be74')
 validpgpkeys=('E7729BFFBE85400FEEEE23B178D7DEFB9AD59AF1') # Donald Scott Kitterman <scott@kitterman.com> 
 
 build() {
   cd "${pkgname#*-}-${pkgver}"
   python -m build --wheel --no-isolation
-  #python setup.py build
 }
 
 package() {
   cd "${pkgname#*-}-${pkgver}"
-  #python setup.py install --root="${pkgdir}" --optimize=1 \
-	#--single-version-externally-managed --skip-build
   python -m installer --destdir="${pkgdir}" dist/*.whl
 
-  # Fix and remove incorrect files and directory structure
-  mv "${pkgdir}/usr/etc" "${pkgdir}/etc"
-  rm "${pkgdir}/etc/init.d/pyspf-milter"
-  rmdir "${pkgdir}/etc/init.d"
-  rm "${pkgdir}/usr/lib/systemd/system/pyspf-milter.service"
+  # Fix directory structure
+  mv "${pkgdir}/usr/local/lib/systemd" "${pkgdir}/usr/lib/"
+  mv "${pkgdir}/usr/local/etc" "${pkgdir}/"
+  rm -rf "${pkgdir}/usr/local"
+  rm -rf "${pkgdir}/etc/init.d"
 
-  install -Dm0644 "${srcdir}/pyspf-milter.sysusers" "${pkgdir}/usr/lib/sysusers.d/pyspf-milter.conf"
-  install -Dm0644 "${srcdir}/pyspf-milter.conf" "${pkgdir}/etc/pyspf-milter/pyspf-milter.conf"
-  install -m0644 "${srcdir}/pyspf-milter.service" "${pkgdir}/usr/lib/systemd/system/"
-  install -m0644 policyd-spf.conf.commented "${pkgdir}/etc/python-policyd-spf/"
+  # Fix systemd unit file
+  sed -i \
+	-e 's|\/usr\/local\/bin|\/usr\/bin|' \
+	-e 's|\/usr\/local\/etc|\/etc|' \
+	"${pkgdir}/usr/lib/systemd/system/pyspf-milter.service"
+
+  # Fix conf file
+  sed -i \
+	-e 's|\#Socket|Socket|' \
+    -e '/inet/d' \
+	"${pkgdir}/etc/pyspf-milter/pyspf-milter.conf"
+
+  install -vDm0644 "${srcdir}/pyspf-milter.sysusers" \
+	"${pkgdir}/usr/lib/sysusers.d/pyspf-milter.conf"
 }