Rebuild against python 3.10

PKGBUILD:
Remove unneeded quotes and curly braces.
Add python-setuptools to makedepends and python to depends.
Simplify package() to adhere to python package guidelines.

2 files changed, 27 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index cf1cda00d5fe..8b526c3749af 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,13 +1,14 @@
 pkgbase = nextcloud-news-updater
 	pkgdesc = A parallel feed updater for the Nextcloud News app
 	pkgver = 11.0.0
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/nextcloud/news-updater
 	install = nextcloud-news-updater.install
 	arch = any
 	license = GPL3
 	checkdepends = python-pytest
-	depends = python-setuptools
+	makedepends = python-setuptools
+	depends = python
 	optdepends = nextcloud-app-news: for updating a local instance of the Nextcloud News app
 	backup = etc/webapps/nextcloud/news/nextcloud-news-updater.ini
 	source = nextcloud-news-updater-11.0.0.tar.gz::https://github.com/nextcloud/news-updater/archive/11.0.0.tar.gz
@@ -27,4 +28,3 @@ pkgbase = nextcloud-news-updater
 	b2sums = a56604d3d29ebbf4fb807bfeec32a90fe5688bd516633f1990e11afd664ba730b941e522c393a21f85b8be2f10cfa08288f0884dc693bcc30b7cc12dc967a0a6
 
 pkgname = nextcloud-news-updater
-
diff --git a/PKGBUILD b/PKGBUILD
index a9c94758a522..5983d168c37f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,20 +5,23 @@
 _name=news-updater
 pkgname=nextcloud-news-updater
 pkgver=11.0.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A parallel feed updater for the Nextcloud News app"
-arch=('any')
+arch=(any)
 url="https://github.com/nextcloud/news-updater"
-license=('GPL3')
-depends=('python-setuptools')
-checkdepends=('python-pytest')
+license=(GPL3)
+depends=(python)
+makedepends=(python-setuptools)
+checkdepends=(python-pytest)
 optdepends=('nextcloud-app-news: for updating a local instance of the Nextcloud News app')
-backup=("etc/webapps/nextcloud/news/${pkgname}.ini")
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/nextcloud/${_name}/archive/${pkgver}.tar.gz"
-        "${pkgname}-11.0.0-tests.patch::https://github.com/nextcloud/news-updater/pull/31/commits/8abcb143ab12119441e80b855e735c766c7c984c.patch"
-        "${pkgname}.ini"
-        "${pkgname}.service"
-        "${pkgname}.timer")
+backup=(etc/webapps/nextcloud/news/$pkgname.ini)
+source=(
+  $pkgname-$pkgver.tar.gz::https://github.com/nextcloud/$_name/archive/$pkgver.tar.gz
+  $pkgname-11.0.0-tests.patch::https://github.com/nextcloud/news-updater/pull/31/commits/8abcb143ab12119441e80b855e735c766c7c984c.patch
+  $pkgname.ini
+  $pkgname.service
+  $pkgname.timer
+)
 sha512sums=('ec47d65c7d2f97a413582771e2ca16102be589b4ed01a917f05e38d161d06926df98cbcb2e5f72b1e89f627efb0f146fbc4d39866ab6481eb93de2a446664f92'
             '3bf01849c889f03d8bf57986e4a97815ae41caf4c100c6e86c79875554fc951079f664d83be96aa7004d8f3b9030027a5c3995a03002c700e1b1e1573f264385'
             'd661d65e3da1d80cc785d40c803663f2e149b53dbb3e1b0e66f1d5c1b07eb3983a9ffeee40b44b04f89bcc787c5cfb7f46e8c408df020a372bc918426b76007b'
@@ -29,36 +32,30 @@ b2sums=('8d327c0c6a64e18a0335cd8f0774c81247dbafe3f5794cc6bac6863e8f8d9e0fc268b92
         'a50439972435dc8ed2277633bd5819c51bbf24af317b64210968e3415d0cdae23a333dc5bc912ed6ce1fb40c1cc27addf31a830a4a45ca63dd0ad28dfdb31209'
         '2ceb1aee05f9448e17cc9755344fa9a22b90e0865a4f13a2f9961ed2730ff6668f42ce2c47932363edca8cb2e54a59855fa67bdbfbd3e182a22447b039c9c6c8'
         'a56604d3d29ebbf4fb807bfeec32a90fe5688bd516633f1990e11afd664ba730b941e522c393a21f85b8be2f10cfa08288f0884dc693bcc30b7cc12dc967a0a6')
-install="${pkgname}.install"
+install=$pkgname.install
 
 prepare() {
-  mv -v "${_name}-${pkgver}" "${pkgname}-${pkgver}"
-  cd "${pkgname}-${pkgver}"
-  patch -Np1 -i ../"${pkgname}-11.0.0-tests.patch"
+  cd $_name-$pkgver
+  patch -Np1 -i ../$pkgname-11.0.0-tests.patch
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
+  cd $_name-$pkgver
   python setup.py build
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
+  cd $_name-$pkgver
   pytest -v
 }
 
 package() {
-  cd "${pkgname}-${pkgver}"
-  python setup.py install --skip-build \
-                          --optimize=1 \
-                          --root="${pkgdir}"
+  cd $_name-$pkgver
+  python setup.py install --optimize=1 --root="$pkgdir"
   # configuration
-  install -vDm 644 "../${pkgname}.ini" \
-    -t "${pkgdir}/etc/webapps/nextcloud/news/"
+  install -vDm 644 ../$pkgname.ini -t "$pkgdir/etc/webapps/nextcloud/news/"
   # systemd service/timer
-  install -vDm 644 "../${pkgname}."{service,timer} \
-    -t "${pkgdir}/usr/lib/systemd/system/"
+  install -vDm 644 ../$pkgname.{service,timer} -t "$pkgdir/usr/lib/systemd/system/"
   # 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/"
 }