Update to work with the current branch.

3 files changed, 22 insertions, 23 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d3c654b9203c..1ae260e5ec1e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = motioneye-git
 	pkgdesc = A web frontend for the motion daemon, Python 3 development branch
-	pkgver = 0.42.r38.g25ee819
+	pkgver = 0.42.1.r310.g601bcfb
 	pkgrel = 1
 	url = https://github.com/ccrisan/motioneye.git
 	install = motioneye.install
@@ -11,16 +11,16 @@ pkgbase = motioneye-git
 	depends = python-jinja
 	depends = python-pillow
 	depends = python-pycurl
-	depends = python-tornado5
+	depends = python-tornado
 	depends = python-six
 	provides = motioneye
 	conflicts = motioneye
 	backup = etc/motioneye/motioneye.conf
-	source = git+https://github.com/ccrisan/motioneye.git#branch=python3
+	source = git+https://github.com/ccrisan/motioneye.git#branch=dev
 	source = motioneye.tmpfiles
 	source = motioneye.service
 	sha256sums = SKIP
 	sha256sums = e7447bf9ab023326e7c396ecad8933eaa3399b16d844a34f288cf55b8c917bfa
-	sha256sums = 68880de868b98c5017e2ab6b87122c241873daf393c084710d81b19c9d0663da
+	sha256sums = 55a72fe49d2bacbc1cc9231ef80afab3859a48c558fe030f46ce8c7d3a95341e
 
 pkgname = motioneye-git
diff --git a/PKGBUILD b/PKGBUILD
index 2caaed6507ff..68421f7482d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,9 +1,10 @@
 # Maintainer: AlphaJack <alphajack at tuta dot io>
+# Maintainer: Jose Riha <jose 1711 gmail com>
 # Contributor: Jeremy MJ <jskier@gmail.com>
 # Contributor: Niklas Hedlund <nojan1989@gmail.com>
 
-pkgname="motioneye-git"
-pkgver=0.42.r38.g25ee819
+pkgname=motioneye-git
+pkgver=0.42.1.r310.g601bcfb
 pkgrel=1
 pkgdesc="A web frontend for the motion daemon, Python 3 development branch"
 url="https://github.com/ccrisan/motioneye.git"
@@ -15,18 +16,18 @@ depends=("motion"
          "python-jinja"
          "python-pillow"
          "python-pycurl"
-         "python-tornado5" # required for @asynchronous handler, deprecated in python-tornaod 5.1 and removed in 6.0
+         "python-tornado"
          "python-six")
 makedepends=("python-setuptools")
 backup=("etc/motioneye/motioneye.conf")
-source=("git+$url#branch=python3"
+source=("git+$url#branch=dev"
         "motioneye.tmpfiles"
         "motioneye.service")
-sha256sums=("SKIP"
-            "e7447bf9ab023326e7c396ecad8933eaa3399b16d844a34f288cf55b8c917bfa"
-            "68880de868b98c5017e2ab6b87122c241873daf393c084710d81b19c9d0663da")
+sha256sums=('SKIP'
+            'e7447bf9ab023326e7c396ecad8933eaa3399b16d844a34f288cf55b8c917bfa'
+            '55a72fe49d2bacbc1cc9231ef80afab3859a48c558fe030f46ce8c7d3a95341e')
 backup=("etc/motioneye/motioneye.conf")
-install="motioneye.install"
+install=motioneye.install
 
 pkgver(){
  cd "motioneye"
@@ -34,22 +35,16 @@ pkgver(){
 }
 
 prepare(){
- cd "motioneye"
+ cd motioneye/motioneye
  sed -i "extra/motioneye.conf.sample" \
-     -e 's|^run_path /var/run$|run_path /var/lib/motioneye|'
-}
-
-build(){
- cd "motioneye"
- python setup.py build
+     -e 's|^run_path /run/motioneye$|run_path /var/run/motioneye|'
 }
 
 package(){
- cd "motioneye"
- python setup.py install --root="$pkgdir" --optimize=1
+ cd motioneye
+ PIP_CONFIG_FILE=/dev/null pip install --isolated --root="${pkgdir}" --ignore-installed --no-deps .
  # configuration folder must be writable by motioneye
- install -D -m 660 "extra/motioneye.conf.sample" "$pkgdir/etc/motioneye/motioneye.conf"
+ install -D -m 660 "motioneye/extra/motioneye.conf.sample" "$pkgdir/etc/motioneye/motioneye.conf"
  install -D -m 644 "$srcdir/motioneye.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/motioneye.conf"
  install -D -m 644 "$srcdir/motioneye.service" "$pkgdir/usr/lib/systemd/system/motioneye.service"
 }
-
diff --git a/motioneye.service b/motioneye.service
index e785478e0450..3c4534d99e62 100644
--- a/motioneye.service
+++ b/motioneye.service
@@ -4,8 +4,12 @@ After=local-fs.target network.target
 
 [Service]
 User=motion
+RuntimeDirectory=motioneye
+LogsDirectory=motioneye
+StateDirectory=motioneye
 ExecStart=/usr/bin/meyectl startserver -c /etc/motioneye/motioneye.conf
 Type=simple
+Restart=on-abort
 
 [Install]
 WantedBy=multi-user.target