upgpkg: zwavejs2mqtt 5.2.0-1

upstream release

3 files changed, 14 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b335d50206bd..e4615e92a9f4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = zwavejs2mqtt
 	pkgdesc = Zwave to Mqtt gateway and Control Panel Web UI.
-	pkgver = 4.5.0
+	pkgver = 5.2.0
 	pkgrel = 1
 	url = https://github.com/zwave-js/zwavejs2mqtt
 	arch = x86_64
@@ -8,14 +8,14 @@ pkgbase = zwavejs2mqtt
 	makedepends = yarn
 	makedepends = node-gyp
 	depends = nodejs
-	source = https://github.com/zwave-js/zwavejs2mqtt/archive/refs/tags/v4.5.0.tar.gz
+	backup = etc/zwavejs2mqtt/app.ts
+	source = https://github.com/zwave-js/zwavejs2mqtt/archive/refs/tags/v5.2.0.tar.gz
 	source = zwavejs2mqtt.sysusers
 	source = zwavejs2mqtt.tmpfiles
 	source = zwavejs2mqtt.service
-	b2sums = e631e41d83dd89ac6cd11f9ed91af4fdb0412b5d0403f9f31ba8ae96462e4d3d02bac0506864435990b325a2a78bb08b7d9b005987fe98b7a93f20dddd63d81e
+	b2sums = d9e6c8e0a9e473a2ebf2c7ce2509be0dcc3d7a1bc25a2ca54cdfc99af00c03cdeece603d046777827e94ef72901bd53b96d5ccd9d1d4589ababe2ad695b13008
 	b2sums = d4a834bd7c8e4c832128f9f9c0ffb9d4409424402ba9c28a430a2d41d19cf780ba606c27b5f3b71f7640caa9883724647f2779cfa3cf2714564eb5e58b6144e2
 	b2sums = 2324c50252e1005b1ec06bf73e9d05937472397f5fc533e7ab468d416bcb6b5d01b87055a41d3b3a5b44b24e02ca45fafb5f79085833988ec458ee72c1d8c31b
-	b2sums = 88af5d6d6ed94f2946f3ed0ceefd16eb548009afce02abf1af399637226b61d810147f1f3ff395a569f9de82b54769299bb78482799b6395335b587e8b83a402
+	b2sums = 48f4a894227918086b7a55a1d20a94cff08088552c7d655a24cddd92e76e74e19cefd4cd7abeb744c0e254bef36cf9e79442dc56c2006ec6a6e94e005a0e906f
 
 pkgname = zwavejs2mqtt
-
diff --git a/PKGBUILD b/PKGBUILD
index ca3005e91dc1..f2d5d04c3d38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Giovanni Harting
 
 pkgname=zwavejs2mqtt
-pkgver=4.5.0
+pkgver=5.2.0
 pkgrel=1
 pkgdesc="Zwave to Mqtt gateway and Control Panel Web UI."
 arch=(x86_64)
@@ -9,15 +9,15 @@ url="https://github.com/zwave-js/zwavejs2mqtt"
 license=('MIT')
 depends=(nodejs)
 makedepends=(yarn node-gyp)
-backup=()
+backup=("etc/zwavejs2mqtt/app.ts")
 source=("https://github.com/zwave-js/$pkgname/archive/refs/tags/v$pkgver.tar.gz"
 	"$pkgname.sysusers"
 	"$pkgname.tmpfiles"
 	"$pkgname.service")
-b2sums=('e631e41d83dd89ac6cd11f9ed91af4fdb0412b5d0403f9f31ba8ae96462e4d3d02bac0506864435990b325a2a78bb08b7d9b005987fe98b7a93f20dddd63d81e'
+b2sums=('d9e6c8e0a9e473a2ebf2c7ce2509be0dcc3d7a1bc25a2ca54cdfc99af00c03cdeece603d046777827e94ef72901bd53b96d5ccd9d1d4589ababe2ad695b13008'
         'd4a834bd7c8e4c832128f9f9c0ffb9d4409424402ba9c28a430a2d41d19cf780ba606c27b5f3b71f7640caa9883724647f2779cfa3cf2714564eb5e58b6144e2'
         '2324c50252e1005b1ec06bf73e9d05937472397f5fc533e7ab468d416bcb6b5d01b87055a41d3b3a5b44b24e02ca45fafb5f79085833988ec458ee72c1d8c31b'
-        '88af5d6d6ed94f2946f3ed0ceefd16eb548009afce02abf1af399637226b61d810147f1f3ff395a569f9de82b54769299bb78482799b6395335b587e8b83a402')
+        '48f4a894227918086b7a55a1d20a94cff08088552c7d655a24cddd92e76e74e19cefd4cd7abeb744c0e254bef36cf9e79442dc56c2006ec6a6e94e005a0e906f')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -27,12 +27,12 @@ build() {
 
 package() {
   cd "$pkgname-$pkgver"
-  install -d "$pkgdir"/usr/share/webapps/$pkgname "$pkgdir"/etc/$pkgname/ "$pkgdir"/usr/bin
-  cp -r {node_modules,bin,lib,dist/static} "$pkgdir"/usr/share/webapps/$pkgname
+  install -d "$pkgdir"/usr/share/webapps/$pkgname "$pkgdir"/etc/$pkgname/ "$pkgdir"/var/lib/$pkgname
+  cp -r {node_modules,bin,lib,dist/static,server,app.ts} "$pkgdir"/usr/share/webapps/$pkgname
   cp -r config/* "$pkgdir"/etc/$pkgname/
-  ln -s /usr/share/webapps/$pkgname/bin/www "$pkgdir"/usr/bin/$pkgname
   ln -s /etc/$pkgname/ "$pkgdir"/usr/share/webapps/$pkgname/config
-  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  ln -s /var/lib/$pkgname "$pkgdir"/usr/share/webapps/$pkgname/store
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
   install -Dm644 "${srcdir}"/$pkgname.sysusers "${pkgdir}"/usr/lib/sysusers.d/$pkgname.conf
   install -Dm644 "${srcdir}"/$pkgname.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/$pkgname.conf
   install -Dm644 "${srcdir}"/$pkgname.service -t "$pkgdir"/usr/lib/systemd/system/
diff --git a/zwavejs2mqtt.service b/zwavejs2mqtt.service
index 9df53400c5d5..952109c42dd4 100644
--- a/zwavejs2mqtt.service
+++ b/zwavejs2mqtt.service
@@ -6,8 +6,7 @@ After=network.target
 Type=simple
 User=zwavejs2mqtt
 Group=zwavejs2mqtt
-ExecStart=/usr/bin/zwavejs2mqtt
-PrivateDevices=true
+ExecStart=/usr/bin/node /usr/share/webapps/zwavejs2mqtt/server/bin/www.js
 PrivateTmp=true
 ProtectSystem=full
 ProtectHome=true