update to 2.3.8, systemd files are upstreamed

5 files changed, 9 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 28f14744b027..aa9eb57558b6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = photoview
 	pkgdesc = Photo gallery for self-hosted personal servers
-	pkgver = 2.3.6
+	pkgver = 2.3.8
 	pkgrel = 1
 	url = https://github.com/photoview/photoview
 	install = photoview.install
@@ -25,15 +25,9 @@ pkgbase = photoview
 	conflicts = golang-photoview
 	replaces = golang-photoview
 	backup = etc/photoview.env
-	source = https://github.com/photoview/photoview/archive/refs/tags/v2.3.6.tar.gz
-	source = photoview.service
+	source = https://github.com/photoview/photoview/archive/refs/tags/v2.3.8.tar.gz
 	source = photoview.env.patch
-	source = photoview.sysusers.conf
-	source = photoview.tmpfiles
-	sha512sums = 36e34b8ab6c52606e6039c304194efd4ca1cec31fdc836b924d9684b03d460723811e4c01a7bb60cbe27427f5356bf93e2172683fb145059bc5b97ed4621154d
-	sha512sums = 85ccf75291f30abd25a3b6679caf52842893a780200fc4dc6bcd067a4578c0dd079821c209fe6b7ea0e1ced120b016c323bc937a79a78a6eb8e81e09569a631b
+	sha512sums = c33b593c15584b97d280f5e4241e84423edc094fa95bf1ee50efc3b2386c83ea20bdc00e0686d76f1d8304f58efed93a66ed61d1c9c86364d839f27a424e7214
 	sha512sums = aa9b3fe32883af83c183a3cf1d0646b6140f2294c5b58d6df3cac4b1f9b89300f955f46fa125d50ccaac866ab60a752d42f547af19772159e6a2f176c0cf6369
-	sha512sums = ad221c26f04bd8087243a0b069df1f99e41b75e0206543a5573069e677e50a15292c02cec1431c396e71a8b674943b9a4659fc7d46a6ab0e3e0a9020903241ea
-	sha512sums = 67eca71ca6588f94bdc9d97899fc5c480b16fe0ad3c7c82cb6e6af1a43797666a1a051b700d91c912fc078e8139cc089a016e1c911978f968f6626e2f499fa54
 
 pkgname = photoview
diff --git a/PKGBUILD b/PKGBUILD
index 712334ae22ed..be5bb058a675 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # https://photoview.github.io/docs/installation-manual/
 
 pkgname=photoview
-pkgver=2.3.6
+pkgver=2.3.8
 pkgrel=1
 pkgdesc="Photo gallery for self-hosted personal servers"
 arch=('x86_64')
@@ -45,17 +45,11 @@ backup=(
 install=${pkgname}.install
 source=(
   "$url/archive/refs/tags/v${pkgver}.tar.gz"
-  "${pkgname}.service"
   "${pkgname}.env.patch"
-  "${pkgname}.sysusers.conf"
-  "${pkgname}.tmpfiles"
 )
 sha512sums=(
-  '36e34b8ab6c52606e6039c304194efd4ca1cec31fdc836b924d9684b03d460723811e4c01a7bb60cbe27427f5356bf93e2172683fb145059bc5b97ed4621154d'
-  '85ccf75291f30abd25a3b6679caf52842893a780200fc4dc6bcd067a4578c0dd079821c209fe6b7ea0e1ced120b016c323bc937a79a78a6eb8e81e09569a631b'
+  'c33b593c15584b97d280f5e4241e84423edc094fa95bf1ee50efc3b2386c83ea20bdc00e0686d76f1d8304f58efed93a66ed61d1c9c86364d839f27a424e7214'
   'aa9b3fe32883af83c183a3cf1d0646b6140f2294c5b58d6df3cac4b1f9b89300f955f46fa125d50ccaac866ab60a752d42f547af19772159e6a2f176c0cf6369'
-  'ad221c26f04bd8087243a0b069df1f99e41b75e0206543a5573069e677e50a15292c02cec1431c396e71a8b674943b9a4659fc7d46a6ab0e3e0a9020903241ea'
-  '67eca71ca6588f94bdc9d97899fc5c480b16fe0ad3c7c82cb6e6af1a43797666a1a051b700d91c912fc078e8139cc089a016e1c911978f968f6626e2f499fa54'
 )
 
 prepare() {
@@ -93,14 +87,14 @@ package() {
   # .env file
   install -Dm0644 "${srcdir}/${_pkg_name_ver}/api/example.env" "${pkgdir}/etc/${pkgname}.env"
 
-  # systemd unit file
-  install -Dm0644 -t "${pkgdir}/usr/lib/systemd/system" "${srcdir}/${pkgname}.service"
   # sqlite and cache dirs
   cd "${pkgdir}"
   install -d "${pkgdir}/var/lib/${pkgname}"
   install -d "${pkgdir}/var/cache/${pkgname}/media_cache"
 
+  # systemd unit file
+  install -Dm0644 -t "${pkgdir}/usr/lib/systemd/system" "${srcdir}/${_pkg_name_ver}/systemd/${pkgname}.service"
   # user and group management
-  install -Dm0644 "${srcdir}/${pkgname}.sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
-  install -Dm0644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -Dm0644 "${srcdir}/${_pkg_name_ver}/systemd/${pkgname}.sysusers.conf" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
+  install -Dm0644 "${srcdir}/${_pkg_name_ver}/systemd/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 }
diff --git a/photoview.service b/photoview.service
deleted file mode 100644
index cda96224a3af..000000000000
--- a/photoview.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Photoview - Photo gallery for self-hosted personal servers
-Documentation=https://photoview.github.io/docs
-After=network.target
-
-[Service]
-ExecStart=/usr/lib/photoview/photoview
-WorkingDirectory=/usr/lib/photoview
-User=photoview
-Group=photoview
-
-ReadWritePaths=/var/lib/photoview
-
-EnvironmentFile=/etc/photoview.env
-CacheDirectory=photoview/media_cache
-
-[Install]
-WantedBy=multi-user.target
diff --git a/photoview.sysusers.conf b/photoview.sysusers.conf
deleted file mode 100644
index ff2e9a5c799c..000000000000
--- a/photoview.sysusers.conf
+++ /dev/null
@@ -1 +0,0 @@
-u photoview - "photoview user"
diff --git a/photoview.tmpfiles b/photoview.tmpfiles
deleted file mode 100644
index 28d93c91152f..000000000000
--- a/photoview.tmpfiles
+++ /dev/null
@@ -1,2 +0,0 @@
-e /var/lib/photoview 0750 photoview photoview
-e /var/cache/photoview 0750 photoview photoview