php legacy support

6 files changed, 30 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8e00c091feef..adc6ec2ffbb7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,11 @@
 pkgbase = nextcloud-systemd-timers
 	pkgdesc = Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry).
-	pkgver = 0.11.0
-	pkgrel = 2
+	pkgver = 0.12.0
+	pkgrel = 1
 	install = nextcloud-systemd-timers.install
 	arch = any
 	license = GPL
+	depends = nextcloud>=25.0.3
 	optdepends = nextcloud-app-previewgenerator: pre-generation of previews
 	source = nextcloud-app-update-all.service
 	source = nextcloud-app-update-all.timer
@@ -14,14 +15,13 @@ pkgbase = nextcloud-systemd-timers
 	source = nextcloud-preview-generate-all.timer
 	source = nextcloud-preview-pre-generate.service
 	source = nextcloud-preview-pre-generate.timer
-	sha256sums = 0706490da2a72647c2d98d52001004ab79b1747eeab330e7653f1e06ab5408dd
+	sha256sums = 1bc1a67db2d391c233d3dcee3e7ebf46f12652cba35fd02a5b5f03c8bd531bec
 	sha256sums = 39039f1a3dc23022fccc991daca86d77e7d41be275566f6892cd6b290fa0da4a
-	sha256sums = 88beeaaad1a05911314fbc6e7db8d316f7ec6d42df107fcd3b1c52cf291f1333
+	sha256sums = b84fe79358b3f183a5207907cf3af22bb7e3ab1f53a36007a74bc4d061351a67
 	sha256sums = 2f191059b619141ba883ae132af56460212c84eb208f087b87b79b0a3b9e4900
-	sha256sums = 4713096a56800abde60380cbf80a45bb60fd83a12dec9ffc93c52283f06fb597
+	sha256sums = 1a61dc1332e4af76229d54288ae62c2221a9162674e8a138a92be36410cad935
 	sha256sums = bd4bbd01a9d68e0217c3b48c977dda881fd956b53f981a6e32af0357d2e0b716
-	sha256sums = 7bc2cb4ae0073bcbb42d86f4e2ce92ca81623dc0ea4b8a631baf0ab4338e8937
+	sha256sums = ceafc82931c82fddfe5354d6821b04610021884bf53d903b25c51a66fcd83cc1
 	sha256sums = 56e3cab181040101be05d4b7723825f7b0c082c34403e42c6f0934c6474a6a43
 
 pkgname = nextcloud-systemd-timers
-
diff --git a/PKGBUILD b/PKGBUILD
index 230aed9f36a1..b970e7011787 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,24 +1,16 @@
-# Maintainer: Dominik Schrempf <dominik.schrempf@gmail.com>
+# Maintainer: Justin Kromliner <hashworks@archlinux.org>
+# Contributor: Dominik Schrempf <dominik.schrempf@gmail.com>
+
 pkgname=nextcloud-systemd-timers
-pkgver=0.11.0
-pkgrel=2
-epoch=
+pkgver=0.12.0
+pkgrel=1
 pkgdesc="Systemd services and timers for Nextcloud background jobs (see Nextcloud Arch Wiki entry)."
 arch=('any')
 url=""
 license=('GPL')
-groups=()
-depends=()
-makedepends=()
-checkdepends=()
+depends=('nextcloud>=25.0.3')
 optdepends=('nextcloud-app-previewgenerator: pre-generation of previews')
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
 install=nextcloud-systemd-timers.install
-changelog=
 source=("nextcloud-app-update-all.service"
         "nextcloud-app-update-all.timer"
         "nextcloud-files-scan-all.service"
@@ -27,44 +19,25 @@ source=("nextcloud-app-update-all.service"
         "nextcloud-preview-generate-all.timer"
         "nextcloud-preview-pre-generate.service"
         "nextcloud-preview-pre-generate.timer")
-sha256sums=('0706490da2a72647c2d98d52001004ab79b1747eeab330e7653f1e06ab5408dd'
+sha256sums=('1bc1a67db2d391c233d3dcee3e7ebf46f12652cba35fd02a5b5f03c8bd531bec'
             '39039f1a3dc23022fccc991daca86d77e7d41be275566f6892cd6b290fa0da4a'
-            '88beeaaad1a05911314fbc6e7db8d316f7ec6d42df107fcd3b1c52cf291f1333'
+            'b84fe79358b3f183a5207907cf3af22bb7e3ab1f53a36007a74bc4d061351a67'
             '2f191059b619141ba883ae132af56460212c84eb208f087b87b79b0a3b9e4900'
-            '4713096a56800abde60380cbf80a45bb60fd83a12dec9ffc93c52283f06fb597'
+            '1a61dc1332e4af76229d54288ae62c2221a9162674e8a138a92be36410cad935'
             'bd4bbd01a9d68e0217c3b48c977dda881fd956b53f981a6e32af0357d2e0b716'
-            '7bc2cb4ae0073bcbb42d86f4e2ce92ca81623dc0ea4b8a631baf0ab4338e8937'
+            'ceafc82931c82fddfe5354d6821b04610021884bf53d903b25c51a66fcd83cc1'
             '56e3cab181040101be05d4b7723825f7b0c082c34403e42c6f0934c6474a6a43')
-noextract=()
-
-# prepare() {
-#   cd "$srcdir/$pkgname-$pkgver"
-#   patch -p1 -i "$srcdir/$pkgname-$pkgver.patch"
-# }
-
-# build() {
-#   cd "$srcdir/$pkgname-$pkgver"
-#   ./configure --prefix=/usr
-#   make
-# }
-
-# check() {
-#   cd "$srcdir/$pkgname-$pkgver"
-#   make -k check
-# }
 
 package() {
-  # cd "$srcdir/$pkgname-$pkgver"
-  # make DESTDIR="$pkgdir/" install
-  install -D -t $pkgdir/usr/lib/systemd/system -m 644 \
-          nextcloud-app-update-all.service \
-          nextcloud-app-update-all.timer \
-          nextcloud-files-scan-all.service \
-          nextcloud-files-scan-all.timer \
-          nextcloud-preview-generate-all.service \
-          nextcloud-preview-generate-all.timer \
-          nextcloud-preview-pre-generate.service \
-          nextcloud-preview-pre-generate.timer
+        install -D -t $pkgdir/usr/lib/systemd/system -m 644 \
+                nextcloud-app-update-all.service \
+                nextcloud-app-update-all.timer \
+                nextcloud-files-scan-all.service \
+                nextcloud-files-scan-all.timer \
+                nextcloud-preview-generate-all.service \
+                nextcloud-preview-generate-all.timer \
+                nextcloud-preview-pre-generate.service \
+                nextcloud-preview-pre-generate.timer
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/nextcloud-app-update-all.service b/nextcloud-app-update-all.service
index 5988264bb240..bb2fce73a547 100644
--- a/nextcloud-app-update-all.service
+++ b/nextcloud-app-update-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; update all applications
 
 [Service]
 User=nextcloud
-ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ app:update --all
+ExecStart=/usr/bin/php-legacy -f /usr/share/webapps/nextcloud/occ app:update --all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-files-scan-all.service b/nextcloud-files-scan-all.service
index f61d461b4423..21e0520a30d0 100644
--- a/nextcloud-files-scan-all.service
+++ b/nextcloud-files-scan-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; scan all files
 
 [Service]
 User=nextcloud
-ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ files:scan --all
+ExecStart=/usr/bin/php-legacy -f /usr/share/webapps/nextcloud/occ files:scan --all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-preview-generate-all.service b/nextcloud-preview-generate-all.service
index df9a0799204a..643365aec18d 100644
--- a/nextcloud-preview-generate-all.service
+++ b/nextcloud-preview-generate-all.service
@@ -3,7 +3,7 @@ Description=Nextcloud; generate previews for all files
 
 [Service]
 User=nextcloud
-ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ preview:generate-all
+ExecStart=/usr/bin/php-legacy -f /usr/share/webapps/nextcloud/occ preview:generate-all
 
 [Install]
 WantedBy=basic.target
diff --git a/nextcloud-preview-pre-generate.service b/nextcloud-preview-pre-generate.service
index 30a4dff8db77..3fe41484f5fc 100644
--- a/nextcloud-preview-pre-generate.service
+++ b/nextcloud-preview-pre-generate.service
@@ -3,7 +3,7 @@ Description=Nextcloud; generate previews for new files only
 
 [Service]
 User=nextcloud
-ExecStart=/usr/bin/php -f /usr/share/webapps/nextcloud/occ preview:pre-generate
+ExecStart=/usr/bin/php-legacy -f /usr/share/webapps/nextcloud/occ preview:pre-generate
 
 [Install]
 WantedBy=basic.target