added immutabledict as dependency

3 files changed, 8 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 7bc676be9759..13c3e4a89c61 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = octoprint
 	pkgdesc = The snappy web interface for your 3D printer on Arch Linux
 	pkgver = 1.7.0rc1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://octoprint.org/
 	install = octoprint.install
 	arch = any
@@ -29,16 +29,16 @@ pkgbase = octoprint
 	depends = python-sarge
 	depends = python-cachelib
 	depends = python-pylru
+	depends = python-immutabledict
 	optdepends = ffmpeg: timelapse support
 	optdepends = curaengine: fast and robust engine for processing 3D models
 	optdepends = mjpg-streamer: stream images from webcam
 	optdepends = motion: motion detector which grabs images from video4linux devices and/or from webcams
-	provides = octoprint
 	conflicts = octoprint-venv
 	options = !distcc
 	options = !ccache
 	backup = etc/conf.d/octoprint
-	source = https://github.com/OctoPrint/OctoPrint/archive/refs/tags/1.7.0rc1.tar.gz
+	source = octoprint-1.7.0rc1.tar.gz::https://github.com/OctoPrint/OctoPrint/archive/refs/tags/1.7.0rc1.tar.gz
 	source = octoprint.sysusers
 	source = octoprint.service
 	source = octoprint-serve
diff --git a/PKGBUILD b/PKGBUILD
index 0f3fcf334131..fdb17702c195 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=octoprint
 pkgver=1.7.0rc1
-pkgrel=1
+pkgrel=2
 pkgdesc="The snappy web interface for your 3D printer on Arch Linux"
 arch=(any)
 url="http://octoprint.org/"
@@ -31,6 +31,7 @@ depends=(
 		python-sarge
 		python-cachelib
 		python-pylru
+		python-immutabledict
 )
 makedepends=('python-virtualenv' 'rust')
 optdepends=('ffmpeg: timelapse support'
@@ -38,11 +39,10 @@ optdepends=('ffmpeg: timelapse support'
 			'mjpg-streamer: stream images from webcam'
 			'motion: motion detector which grabs images from video4linux devices and/or from webcams'
 			)
-provides=(octoprint)
 conflicts=('octoprint-venv')
 install=octoprint.install
 backup=(etc/conf.d/octoprint)
-source=("https://github.com/OctoPrint/OctoPrint/archive/refs/tags/${pkgver}.tar.gz"
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/OctoPrint/OctoPrint/archive/refs/tags/${pkgver}.tar.gz"
 		octoprint.sysusers
 		octoprint.service
 		octoprint-serve
@@ -70,6 +70,7 @@ prepare()
 }
 
 package() {
+	# TODO remove venv
 	python -m venv --system-site-packages --symlinks $pkgdir/usr/lib/$pkgname
 	source $pkgdir/usr/lib/$pkgname/bin/activate
 
diff --git a/octoprint.install b/octoprint.install
index 66363a4fea9f..81f901c83335 100755
--- a/octoprint.install
+++ b/octoprint.install
@@ -3,7 +3,7 @@ post_install()
 	systemd-sysusers
 
 	mkdir -p /var/lib/octoprint
-	chown -R octoprint:octoprint /var/lib/octoprint /usr/lib/octoprint/lib/python2.7/site-packages
+	chown -R octoprint:octoprint /var/lib/octoprint /usr/lib/octoprint/lib
 
 	echo "To start octoprint, run: systemctl start octoprint"
 	echo "To enable octoprint at boot, run: systemctl enable octoprint"