[arch-commits] Commit in pgadmin4/repos (16 files)

Levente Polyak anthraxx at archlinux.org
Tue Aug 1 18:16:05 UTC 2017


    Date: Tuesday, August 1, 2017 @ 18:16:05
  Author: anthraxx
Revision: 247371

archrelease: copy trunk to community-i686, community-x86_64

Added:
  pgadmin4/repos/community-i686/PKGBUILD
    (from rev 247370, pgadmin4/trunk/PKGBUILD)
  pgadmin4/repos/community-i686/config_distro.py
    (from rev 247370, pgadmin4/trunk/config_distro.py)
  pgadmin4/repos/community-i686/config_local.py
    (from rev 247370, pgadmin4/trunk/config_local.py)
  pgadmin4/repos/community-i686/pgAdmin4.desktop
    (from rev 247370, pgadmin4/trunk/pgAdmin4.desktop)
  pgadmin4/repos/community-x86_64/PKGBUILD
    (from rev 247370, pgadmin4/trunk/PKGBUILD)
  pgadmin4/repos/community-x86_64/config_distro.py
    (from rev 247370, pgadmin4/trunk/config_distro.py)
  pgadmin4/repos/community-x86_64/config_local.py
    (from rev 247370, pgadmin4/trunk/config_local.py)
  pgadmin4/repos/community-x86_64/pgAdmin4.desktop
    (from rev 247370, pgadmin4/trunk/pgAdmin4.desktop)
Deleted:
  pgadmin4/repos/community-i686/PKGBUILD
  pgadmin4/repos/community-i686/config_distro.py
  pgadmin4/repos/community-i686/config_local.py
  pgadmin4/repos/community-i686/pgAdmin4.desktop
  pgadmin4/repos/community-x86_64/PKGBUILD
  pgadmin4/repos/community-x86_64/config_distro.py
  pgadmin4/repos/community-x86_64/config_local.py
  pgadmin4/repos/community-x86_64/pgAdmin4.desktop

-----------------------------------+
 /PKGBUILD                         |  198 ++++++++++++++++++++++++++++++++++++
 /config_distro.py                 |    4 
 /pgAdmin4.desktop                 |   22 ++++
 community-i686/PKGBUILD           |   83 ---------------
 community-i686/config_distro.py   |    2 
 community-i686/pgAdmin4.desktop   |   11 --
 community-x86_64/PKGBUILD         |   83 ---------------
 community-x86_64/config_distro.py |    2 
 community-x86_64/pgAdmin4.desktop |   11 --
 9 files changed, 224 insertions(+), 192 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-i686/PKGBUILD	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Jerome Leclanche <jerome at leclan.ch>
-
-pkgname=pgadmin4
-pkgver=1.6
-pkgrel=1
-pkgdesc="Comprehensive design and management interface for PostgreSQL"
-arch=("i686" "x86_64")
-url="https://www.pgadmin.org/"
-license=("custom")
-depends=("qt5-webengine" "python" "postgresql-libs" "hicolor-icon-theme")
-makedepends=("python-setuptools" "imagemagick")
-source=(
-	"https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v$pkgver/source/$pkgname-$pkgver.tar.gz"{,.sig}
-	"pgAdmin4.desktop"
-	"config_distro.py"
-	"config_local.py"
-	# https://www.postgresql.org/message-id/CAMQ-g0dHUN2SFioNg93hCTJkRR3LsVZ-ZvhUh6in%2BO4UAU2Qow%40mail.gmail.com
-)
-sha256sums=(
-	"514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8"
-	"SKIP"
-	"9a39a321fa5a7fcf4f7f7abf6872de6de537800212e9f6f4902ed37b806765b7"
-	"510c11bf26fa335548ec4c582bc9f5a5242b8e03f3cb0b7c19e6bfd12b6d663c"
-	"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-)
-validpgpkeys=(
-	"E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519"
-)
-
-
-prepare() {
-	cd "$pkgname-$pkgver"
-	convert runtime/pgAdmin4.{ico,png}
-
-	/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
-}
-
-
-build() {
-	export LANG=en_US.UTF-8
-	export LC_ALL=en_US.UTF-8
-
-	cd "$pkgname-$pkgver/runtime"
-	qmake CONFIG+=release
-	make
-
-	PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make -C "$srcdir/$pkgname-$pkgver" docs
-}
-
-
-package() {
-	cd "$pkgname-$pkgver"
-
-	install -D runtime/pgAdmin4 "$pkgdir/usr/lib/pgadmin4/runtime/pgAdmin4"
-
-	cp -a docs web "$pkgdir/usr/lib/pgadmin4"
-	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_local.py"
-
-	### Launcher
-
-	install -Dm644 runtime/pgAdmin4-0.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-1.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-2.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-3.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png"
-
-	install -Dm644 "$srcdir/pgAdmin4.desktop" "$pkgdir/usr/share/applications/pgAdmin4.desktop"
-
-	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4" <<END
-#!/bin/sh
-exec /usr/lib/pgadmin4/runtime/pgAdmin4 "\$@"
-END
-
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: pgadmin4/repos/community-i686/PKGBUILD (from rev 247370, pgadmin4/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Jerome Leclanche <jerome at leclan.ch>
+
+pkgname=pgadmin4
+pkgver=1.6
+pkgrel=2
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=("i686" "x86_64")
+url="https://www.pgadmin.org/"
+license=("custom")
+depends=("qt5-webengine" "python" "python-psycopg2" "postgresql-libs" "hicolor-icon-theme")
+makedepends=("python-setuptools" "imagemagick")
+source=(
+	"https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v$pkgver/source/$pkgname-$pkgver.tar.gz"{,.sig}
+	"pgAdmin4.desktop"
+	"config_distro.py"
+	"config_local.py"
+	# https://www.postgresql.org/message-id/CAMQ-g0dHUN2SFioNg93hCTJkRR3LsVZ-ZvhUh6in%2BO4UAU2Qow%40mail.gmail.com
+)
+sha256sums=(
+	"514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8"
+	"SKIP"
+	"9a39a321fa5a7fcf4f7f7abf6872de6de537800212e9f6f4902ed37b806765b7"
+	"510c11bf26fa335548ec4c582bc9f5a5242b8e03f3cb0b7c19e6bfd12b6d663c"
+	"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+)
+validpgpkeys=(
+	"E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519"
+)
+
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')"
+	sed 's|value("PythonPath")|value("PythonPath", "/usr/lib/pgadmin4/venv/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'")|g' -i runtime/{pgAdmin4.cpp,Server.cpp,BrowserWindow.cpp}
+	sed -r 's|(venv/lib/python)|\1'${PYTHONVERSION}'|g' runtime/Server.cpp
+}
+
+
+build() {
+	export LANG=en_US.UTF-8
+	export LC_ALL=en_US.UTF-8
+
+	cd "$pkgname-$pkgver"
+	convert runtime/pgAdmin4.{ico,png}
+
+	python -m venv "$srcdir/$pkgname-$pkgver/venv"
+	"$srcdir/$pkgname-$pkgver/venv/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt"
+
+	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
+
+	PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make docs
+
+	cd runtime
+	qmake CONFIG+=release
+	make
+}
+
+
+package() {
+	cd "$pkgname-$pkgver"
+
+	install -D runtime/pgAdmin4 "$pkgdir/usr/lib/pgadmin4/runtime/pgAdmin4"
+
+	cp -a docs web "$pkgdir/usr/lib/pgadmin4"
+	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_local.py"
+
+	### fixup some python wonkyness
+	local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')"
+	rm -r "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages/psycopg2"
+	ln -s /usr/lib/python3.6/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload"
+
+	### Launcher
+
+	install -Dm644 runtime/pgAdmin4-0.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-1.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-2.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-3.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png"
+
+	install -Dm644 "$srcdir/pgAdmin4.desktop" "$pkgdir/usr/share/applications/pgAdmin4.desktop"
+
+	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4" <<END
+#!/bin/sh
+cd /usr/lib/pgadmin4
+exec runtime/pgAdmin4 "\$@"
+END
+	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4-server" <<END
+#!/bin/sh
+cd /usr/lib/pgadmin4
+PYTHONPATH="/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages" python web/pgAdmin4.py "\$@"
+END
+
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: community-i686/config_distro.py
===================================================================
--- community-i686/config_distro.py	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-i686/config_distro.py	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,2 +0,0 @@
-SERVER_MODE = False
-HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/"

Copied: pgadmin4/repos/community-i686/config_distro.py (from rev 247370, pgadmin4/trunk/config_distro.py)
===================================================================
--- community-i686/config_distro.py	                        (rev 0)
+++ community-i686/config_distro.py	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,2 @@
+SERVER_MODE = False
+HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/"

Deleted: community-i686/config_local.py
===================================================================
Copied: pgadmin4/repos/community-i686/config_local.py (from rev 247370, pgadmin4/trunk/config_local.py)
===================================================================
Deleted: community-i686/pgAdmin4.desktop
===================================================================
--- community-i686/pgAdmin4.desktop	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-i686/pgAdmin4.desktop	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=pgAdmin 4
-Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
-Icon=pgAdmin4
-Type=Application
-Categories=Application;Development;
-MimeType=text/html
-DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
-Comment=PostgreSQL Tools
-Keywords=database;db;sql;query;administration;development;

Copied: pgadmin4/repos/community-i686/pgAdmin4.desktop (from rev 247370, pgadmin4/trunk/pgAdmin4.desktop)
===================================================================
--- community-i686/pgAdmin4.desktop	                        (rev 0)
+++ community-i686/pgAdmin4.desktop	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=pgAdmin 4
+Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
+Icon=pgAdmin4
+Type=Application
+Categories=Application;Development;
+MimeType=text/html
+DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
+Comment=PostgreSQL Tools
+Keywords=database;db;sql;query;administration;development;

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-x86_64/PKGBUILD	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,83 +0,0 @@
-# $Id$
-# Maintainer: Jerome Leclanche <jerome at leclan.ch>
-
-pkgname=pgadmin4
-pkgver=1.6
-pkgrel=1
-pkgdesc="Comprehensive design and management interface for PostgreSQL"
-arch=("i686" "x86_64")
-url="https://www.pgadmin.org/"
-license=("custom")
-depends=("qt5-webengine" "python" "postgresql-libs" "hicolor-icon-theme")
-makedepends=("python-setuptools" "imagemagick")
-source=(
-	"https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v$pkgver/source/$pkgname-$pkgver.tar.gz"{,.sig}
-	"pgAdmin4.desktop"
-	"config_distro.py"
-	"config_local.py"
-	# https://www.postgresql.org/message-id/CAMQ-g0dHUN2SFioNg93hCTJkRR3LsVZ-ZvhUh6in%2BO4UAU2Qow%40mail.gmail.com
-)
-sha256sums=(
-	"514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8"
-	"SKIP"
-	"9a39a321fa5a7fcf4f7f7abf6872de6de537800212e9f6f4902ed37b806765b7"
-	"510c11bf26fa335548ec4c582bc9f5a5242b8e03f3cb0b7c19e6bfd12b6d663c"
-	"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-)
-validpgpkeys=(
-	"E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519"
-)
-
-
-prepare() {
-	cd "$pkgname-$pkgver"
-	convert runtime/pgAdmin4.{ico,png}
-
-	/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
-}
-
-
-build() {
-	export LANG=en_US.UTF-8
-	export LC_ALL=en_US.UTF-8
-
-	cd "$pkgname-$pkgver/runtime"
-	qmake CONFIG+=release
-	make
-
-	PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make -C "$srcdir/$pkgname-$pkgver" docs
-}
-
-
-package() {
-	cd "$pkgname-$pkgver"
-
-	install -D runtime/pgAdmin4 "$pkgdir/usr/lib/pgadmin4/runtime/pgAdmin4"
-
-	cp -a docs web "$pkgdir/usr/lib/pgadmin4"
-	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_local.py"
-
-	### Launcher
-
-	install -Dm644 runtime/pgAdmin4-0.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-1.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-2.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png"
-	install -Dm644 runtime/pgAdmin4-3.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png"
-
-	install -Dm644 "$srcdir/pgAdmin4.desktop" "$pkgdir/usr/share/applications/pgAdmin4.desktop"
-
-	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4" <<END
-#!/bin/sh
-exec /usr/lib/pgadmin4/runtime/pgAdmin4 "\$@"
-END
-
-	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}

Copied: pgadmin4/repos/community-x86_64/PKGBUILD (from rev 247370, pgadmin4/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: Jerome Leclanche <jerome at leclan.ch>
+
+pkgname=pgadmin4
+pkgver=1.6
+pkgrel=2
+pkgdesc="Comprehensive design and management interface for PostgreSQL"
+arch=("i686" "x86_64")
+url="https://www.pgadmin.org/"
+license=("custom")
+depends=("qt5-webengine" "python" "python-psycopg2" "postgresql-libs" "hicolor-icon-theme")
+makedepends=("python-setuptools" "imagemagick")
+source=(
+	"https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v$pkgver/source/$pkgname-$pkgver.tar.gz"{,.sig}
+	"pgAdmin4.desktop"
+	"config_distro.py"
+	"config_local.py"
+	# https://www.postgresql.org/message-id/CAMQ-g0dHUN2SFioNg93hCTJkRR3LsVZ-ZvhUh6in%2BO4UAU2Qow%40mail.gmail.com
+)
+sha256sums=(
+	"514c021994c91eb9adb4a42edcec12974b473175289d48a5824b8c0f4e15e0c8"
+	"SKIP"
+	"9a39a321fa5a7fcf4f7f7abf6872de6de537800212e9f6f4902ed37b806765b7"
+	"510c11bf26fa335548ec4c582bc9f5a5242b8e03f3cb0b7c19e6bfd12b6d663c"
+	"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+)
+validpgpkeys=(
+	"E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519"
+)
+
+
+prepare() {
+	cd "$pkgname-$pkgver"
+	local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')"
+	sed 's|value("PythonPath")|value("PythonPath", "/usr/lib/pgadmin4/venv/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'/site-packages:/usr/lib/python'${PYTHONVERSION}'")|g' -i runtime/{pgAdmin4.cpp,Server.cpp,BrowserWindow.cpp}
+	sed -r 's|(venv/lib/python)|\1'${PYTHONVERSION}'|g' runtime/Server.cpp
+}
+
+
+build() {
+	export LANG=en_US.UTF-8
+	export LC_ALL=en_US.UTF-8
+
+	cd "$pkgname-$pkgver"
+	convert runtime/pgAdmin4.{ico,png}
+
+	python -m venv "$srcdir/$pkgname-$pkgver/venv"
+	"$srcdir/$pkgname-$pkgver/venv/bin/python" -m pip install -r "$srcdir/$pkgname-$pkgver/requirements.txt"
+
+	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
+
+	PATH="$srcdir/$pkgname-$pkgver/venv-docs/bin:$PATH" make docs
+
+	cd runtime
+	qmake CONFIG+=release
+	make
+}
+
+
+package() {
+	cd "$pkgname-$pkgver"
+
+	install -D runtime/pgAdmin4 "$pkgdir/usr/lib/pgadmin4/runtime/pgAdmin4"
+
+	cp -a docs web "$pkgdir/usr/lib/pgadmin4"
+	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_local.py"
+
+	### fixup some python wonkyness
+	local PYTHONVERSION="$(python -c 'import sys; print("{}.{}".format(sys.version_info.major, sys.version_info.minor))')"
+	rm -r "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages/psycopg2"
+	ln -s /usr/lib/python3.6/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload"
+
+	### Launcher
+
+	install -Dm644 runtime/pgAdmin4-0.png "$pkgdir/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-1.png "$pkgdir/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-2.png "$pkgdir/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png"
+	install -Dm644 runtime/pgAdmin4-3.png "$pkgdir/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png"
+
+	install -Dm644 "$srcdir/pgAdmin4.desktop" "$pkgdir/usr/share/applications/pgAdmin4.desktop"
+
+	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4" <<END
+#!/bin/sh
+cd /usr/lib/pgadmin4
+exec runtime/pgAdmin4 "\$@"
+END
+	install -D /dev/stdin "$pkgdir/usr/bin/pgadmin4-server" <<END
+#!/bin/sh
+cd /usr/lib/pgadmin4
+PYTHONPATH="/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/site-packages" python web/pgAdmin4.py "\$@"
+END
+
+	install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}

Deleted: community-x86_64/config_distro.py
===================================================================
--- community-x86_64/config_distro.py	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-x86_64/config_distro.py	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,2 +0,0 @@
-SERVER_MODE = False
-HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/"

Copied: pgadmin4/repos/community-x86_64/config_distro.py (from rev 247370, pgadmin4/trunk/config_distro.py)
===================================================================
--- community-x86_64/config_distro.py	                        (rev 0)
+++ community-x86_64/config_distro.py	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,2 @@
+SERVER_MODE = False
+HELP_PATH = "/usr/lib/pgadmin4/docs/en_US/_build/html/"

Deleted: community-x86_64/config_local.py
===================================================================
Copied: pgadmin4/repos/community-x86_64/config_local.py (from rev 247370, pgadmin4/trunk/config_local.py)
===================================================================
Deleted: community-x86_64/pgAdmin4.desktop
===================================================================
--- community-x86_64/pgAdmin4.desktop	2017-08-01 18:15:46 UTC (rev 247370)
+++ community-x86_64/pgAdmin4.desktop	2017-08-01 18:16:05 UTC (rev 247371)
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=pgAdmin 4
-Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
-Icon=pgAdmin4
-Type=Application
-Categories=Application;Development;
-MimeType=text/html
-DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
-Comment=PostgreSQL Tools
-Keywords=database;db;sql;query;administration;development;

Copied: pgadmin4/repos/community-x86_64/pgAdmin4.desktop (from rev 247370, pgadmin4/trunk/pgAdmin4.desktop)
===================================================================
--- community-x86_64/pgAdmin4.desktop	                        (rev 0)
+++ community-x86_64/pgAdmin4.desktop	2017-08-01 18:16:05 UTC (rev 247371)
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=pgAdmin 4
+Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
+Icon=pgAdmin4
+Type=Application
+Categories=Application;Development;
+MimeType=text/html
+DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
+Comment=PostgreSQL Tools
+Keywords=database;db;sql;query;administration;development;



More information about the arch-commits mailing list