Make the PKGBUILD work with the just released python3.9

3 files changed, 6 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 15e0aba36e6a..95e4c7e66a4c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = papermerge
 	pkgdesc = An open source document management system (DMS) primarily designed for archiving and retrieving your digital documents.
 	pkgver = 1.5.3
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/ciur/papermerge
 	install = papermerge.install
 	arch = any
@@ -33,6 +33,7 @@ pkgbase = papermerge
 	optdepends = python-redis: file based transport of messaging queue
 	backup = etc/papermerge.conf.py
 	backup = usr/lib/python3.8/site-packages/config/settings/production.py
+	backup = usr/lib/python3.9/site-packages/config/settings/production.py
 	source = papermerge-1.5.3.src.tar.gz::https://github.com/ciur/papermerge/archive/v1.5.3.tar.gz
 	source = papermerge.install
 	source = papermerge.sysusers
diff --git a/PKGBUILD b/PKGBUILD
index 756295a2d512..fe4363e301a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,12 @@
 
 pkgname=papermerge
 pkgver=1.5.3
-pkgrel=1
+pkgrel=2
 pkgdesc="An open source document management system (DMS) primarily designed for archiving and retrieving your digital documents."
 arch=('any')
 url="https://github.com/ciur/papermerge"
 license=('Apache')
-backup=("etc/$pkgname.conf.py" "usr/lib/python3.8/site-packages/config/settings/production.py")
+backup=("etc/$pkgname.conf.py" "usr/lib/python3.8/site-packages/config/settings/production.py" "usr/lib/python3.9/site-packages/config/settings/production.py")
 install=$pkgname.install
 depends=('imagemagick' 'pdftk' 'poppler' 'python-celery' 'python-django' 'python-django-allauth' 'python-django-celery-results' 'python-django-dynamic-preferences' 'python-django-modelcluster' 'python-django-mptt' 'python-django-polymorphic-tree' 'python-django-rest-framework' 'python-django-rest-knox' 'python-django-taggit' 'python-imapclient' 'python-lxml' 'python-mgclipboard' 'python-mglib' 'python-psycopg2' 'python-pyaml' 'tesseract' 'gunicorn')
 optdepends=('nginx: reverse proxy for papermerge provided by gunicorn' 'redis: file based transport of messaging queue' 'python-redis: file based transport of messaging queue')
diff --git a/papermerge.install b/papermerge.install
index 52bf2528a861..33abb0e690b0 100644
--- a/papermerge.install
+++ b/papermerge.install
@@ -1,7 +1,6 @@
 pre_install() {
 	# create the papermerge user and folders early so we can chown the migrations folder and run migrations after installation
 	echo 'u papermerge - "open source document management system" -' | systemd-sysusers --replace=/usr/lib/sysusers.d/papermerge.conf -
-	
 	{
 		echo 'd /var/lib/papermerge/media - papermerge papermerge -'
 		echo 'd /var/lib/papermerge/media - papermerge papermerge -'
@@ -11,9 +10,6 @@ pre_install() {
 		echo 'd /run/papermerge - papermerge papermerge -'
 		echo 'd /var/log/papermerge - papermerge papermerge -'
 	} | systemd-tmpfiles --create --replace=/usr/lib/tmpfiles.d/papermerge.conf -
-	
-	# mkdir -p "/usr/lib/python3.8/site-packages/papermerge/core"
-	# ln -s /var/lib/papermerge/migrations "/usr/lib/python3.8/site-packages/papermerge/core/migrations"
 }
 
 post_install() {
@@ -22,8 +18,7 @@ post_install() {
 	# Make sure the papermerge user owns the migrations directory (write access needed)
 	if id papermerge &>/dev/null; then
 		chown -R papermerge:papermerge "/usr/lib/python3.8/site-packages/papermerge/core/migrations"
-	else
-		printf '\n --> Please run "sudo chown -R papermerge:papermerge /usr/lib/python3.8/site-packages/papermerge/core/migrations" before launching the papermerge service for the first time!\n'
+		chown -R papermerge:papermerge "/usr/lib/python3.9/site-packages/papermerge/core/migrations"
 	fi
 	
 	# run the migrations
@@ -39,6 +34,7 @@ post_install() {
 post_upgrade() {
 	# Make sure the papermerge user owns the migrations directory (write access needed)
 	chown -R papermerge:papermerge "/usr/lib/python3.8/site-packages/papermerge/core/migrations"
+	chown -R papermerge:papermerge "/usr/lib/python3.9/site-packages/papermerge/core/migrations"
 	
 	# run the migrations
 	runuser -u papermerge -- /usr/bin/papermerge-manage makemigrations --merge --noinput