[arch-commits] Commit in vdirsyncer/trunk (PKGBUILD)

[David Runge]

    Date: Saturday, December 4, 2021 @ 10:13:53
  Author: dvzrv
Revision: 1065002

Remove broken test for python 3.10 rebuild.

Upstream has already replaced the broken test in question, but is without release.
We are not yet using the upstream commit as it would require another dependency.
Simplify quoting in file.
Simplify installation in package() to adhere to python package guidelines.

Modified:
  vdirsyncer/trunk/PKGBUILD

----------+
 PKGBUILD |   42 ++++++++++++++++++++++++------------------
 1 file changed, 24 insertions(+), 18 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-12-04 09:26:07 UTC (rev 1065001)
+++ PKGBUILD	2021-12-04 10:13:53 UTC (rev 1065002)
@@ -4,23 +4,34 @@
 
 pkgname=vdirsyncer
 pkgver=0.18.0
-pkgrel=2
+pkgrel=1
 pkgdesc="Synchronize CalDAV and CardDAV."
-arch=('any')
+arch=(any)
 url="https://vdirsyncer.pimutils.org/en/stable/"
-license=('BSD')
-depends=('python-atomicwrites' 'python-click' 'python-click-log'
-         'python-click-threading' 'python-requests' 'python-requests-toolbelt')
-makedepends=('git' 'python-setuptools-scm' 'python-sphinx')
+license=(BSD)
+depends=(python-atomicwrites python-click python-click-log
+python-click-threading python-requests python-requests-toolbelt)
+makedepends=(git python-setuptools-scm python-sphinx)
+checkdepends=(python-hypothesis python-pytest python-pytest-localserver
+python-pytest-subtesthack)
 optdepends=('python-requests-oauthlib: Google support'
             'python-etesync: Etesync support'
             'python-django: Etesync support')
-checkdepends=('python-hypothesis' 'python-pytest' 'python-pytest-localserver'
-              'python-pytest-subtesthack')
-source=("git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed")
-sha512sums=('SKIP')
+source=(
+  "git+https://github.com/pimutils/vdirsyncer.git#tag=${pkgver}?signed"
+  "${pkgname}-0.18.0-remove_broken_fingerprint_test.patch"
+)
+sha512sums=('SKIP'
+            '91cdd6350771025478d44aa260b41357a8142d8bbbf7b63cd821b54d3645b7049a4d44ddb82de37425747c32dfa9a1d3b9ad08c77ec142b30a8281741e0c062d')
 validpgpkeys=('951082781CA308E4A529DEFD6F9FFF122B98C0CD') # Hugo Osvaldo Barrera <hugo at barrera.io>
 
+prepare() {
+  cd "${pkgname}"
+  # remove broken test. upstream will replace it with differing dependencies in an upcoming version
+  # https://github.com/pimutils/vdirsyncer/commit/1f6cc6f8beebd644d6570ce98fe56c33a8846daf
+  patch -Np1 -i ../"${pkgname}-0.18.0-remove_broken_fingerprint_test.patch"
+}
+
 build() {
   cd "${pkgname}"
   python setup.py build
@@ -36,18 +47,13 @@
 
 package() {
   cd "${pkgname}"
-  python setup.py install --skip-build \
-    --optimize=1 \
-    --prefix=/usr \
-    --root="${pkgdir}"
+  python setup.py install --optimize=1 --root="${pkgdir}"
   # license
   install -vDm 644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}/"
   # systemd
-  install -vDm 644 "contrib/${pkgname}."{service,timer} \
-    -t "${pkgdir}/usr/lib/systemd/user/"
+  install -vDm 644 "contrib/${pkgname}."{service,timer} -t "${pkgdir}/usr/lib/systemd/user/"
   # man page
   install -vDm 644 "build/${pkgname}.1" -t "${pkgdir}/usr/share/man/man1"
   # docs
-  install -vDm 644 {AUTHORS,CHANGELOG,README}.rst \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 {AUTHORS,CHANGELOG,README}.rst -t "${pkgdir}/usr/share/doc/${pkgname}"
 }