[arch-commits] Commit in pgadmin4/trunk (PKGBUILD)

[Jerome Leclanche]

    Date: Sunday, June 18, 2017 @ 10:59:49
  Author: jleclanche
Revision: 238032

upgpkg: pgadmin4 1.5-3

Remove Sphinx from runtime; Fix server config

Modified:
  pgadmin4/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-06-18 10:46:46 UTC (rev 238031)
+++ PKGBUILD	2017-06-18 10:59:49 UTC (rev 238032)
@@ -3,7 +3,7 @@
 
 pkgname=pgadmin4
 pkgver=1.5
-pkgrel=2
+pkgrel=3
 pkgdesc="Comprehensive design and management interface for PostgreSQL"
 arch=("i686" "x86_64")
 url="https://www.pgadmin.org/"
@@ -36,10 +36,12 @@
 	patch -Np1 -i "../0001-Simplify-Server-s-python-setup.patch"
 	convert runtime/pgAdmin4.{ico,png}
 
-	_venv="$srcdir/$pkgname-$pkgver/venv"
-	/usr/bin/python -m venv "$_venv"
-	"$_venv/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt"
-	"$_venv/bin/python" -m pip install sphinx  # building docs
+	/usr/bin/python -m venv "$srcdir/$pkgname-$pkgver/venv"
+	"$srcdir/$pkgname-$pkgver/venv/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt"
+
+	/usr/bin/python -m venv "$srcdir/$pkgname-$pkgver/venv-docs"
+	"$srcdir/$pkgname-$pkgver/venv-docs/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt"
+	"$srcdir/$pkgname-$pkgver/venv-docs/bin/python" -m pip install sphinx
 }
 
 
@@ -51,7 +53,7 @@
 	qmake CONFIG+=release
 	make
 
-	PATH="$_venv/bin:$PATH" make -C "$srcdir/$pkgname-$pkgver" docs
+	PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make -C "$srcdir/$pkgname-$pkgver" docs
 }
 
 
@@ -64,7 +66,7 @@
 	cp -a venv "$pkgdir/usr/lib/pgadmin4/venv"
 
 	install -Dm644 "$srcdir/config_distro.py" "$pkgdir/usr/lib/pgadmin4/web/config_distro.py"
-	install -Dm644 "$srcdir/config_local.py" "$pkgdir/usr/lib/pgadmin4/web/config_distro.py"
+	install -Dm644 "$srcdir/config_local.py" "$pkgdir/usr/lib/pgadmin4/web/config_local.py"
 
 	### Launcher