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

[Levente Polyak]

    Date: Sunday, September 9, 2018 @ 14:48:45
  Author: anthraxx
Revision: 378906

upgpkg: pgadmin4 3.3-1

Modified:
  pgadmin4/trunk/PKGBUILD
  pgadmin4/trunk/pgAdmin4.desktop

------------------+
 PKGBUILD         |   27 +++++++++++++--------------
 pgAdmin4.desktop |    2 +-
 2 files changed, 14 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-09-09 14:45:14 UTC (rev 378905)
+++ PKGBUILD	2018-09-09 14:48:45 UTC (rev 378906)
@@ -2,7 +2,7 @@
 # Maintainer: Jerome Leclanche <jerome at leclan.ch>
 
 pkgname=pgadmin4
-pkgver=3.2
+pkgver=3.3
 pkgrel=1
 pkgdesc='Comprehensive design and management interface for PostgreSQL'
 url='https://www.pgadmin.org/'
@@ -10,13 +10,14 @@
 license=('custom')
 depends=('qt5-base' '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
+source=(https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${pkgver}/source/${pkgname}-${pkgver}.tar.gz{,.asc}
         pgAdmin4.desktop
         config_distro.py
         config_local.py)
-validpgpkeys=('E0C4CEEB826B1FDA4FB468E024ADFAAF698F1519')
-sha512sums=('b8d6a60a367ce36b74312753c377ce6c1717638e8e48457a3415000578a891d336bf0a43cabbe62b08eaa3ebddf95081a9a915c04fe8708c7cea9ce1e4bd3b00'
-            '25e6ae6658dd25aa9ebaccaef89ab15c19d513da3641fecaf9100d1139b0cc32c027f60a688f5fdff3b26e7be7897e33e9a7b4dddbf68599e583bd5b2e7946e9'
+validpgpkeys=('E8697E2EEF76C02D3A6332778881B2A8210976F2') # Package Manager (Package Signing Key) <packages at pgadmin.org>
+sha512sums=('25027298a51d2ce01902fcd2314e35a44dfb5e3d7f6f5f1620841488bd5b8215436ffcad102fe9846ed4a9dee550232cb0b03c2ee0d5f46f53c753c8107e7ec3'
+            'SKIP'
+            'b19dda3331585010c759099eb09f4db288ce4cd3d36882b56748e1e3756dc7bee2899d7438d496280498ec6a60f6e1ba90309d49fc599403f1fdc7e8817b6645'
             '16d00dc2095904a6b12da7039458f632873829ad98d4d7653eac5804032ba92097ccae4488d56467d0ea9bd64e2654a3dead73eb7924c947ff1737ff6e3b4745'
             'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e')
 
@@ -35,12 +36,12 @@
   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 ./venv
+  venv/bin/python -m pip install -r 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
+  python -m venv ./venv-docs
+  venv-docs/bin/python -m pip install -r requirements.txt
+  venv-docs/bin/python -m pip install sphinx
 
   PATH="${srcdir}/${pkgname}-${pkgver}/venv-docs/bin:${PATH}" make docs
 
@@ -53,7 +54,7 @@
 package() {
   cd "${pkgname}-${pkgver}"
 
-  install -D runtime/pgAdmin4 "${pkgdir}/usr/lib/pgadmin4/runtime/pgAdmin4"
+  install -Dm 755 runtime/pgAdmin4 "${pkgdir}/usr/lib/pgadmin4/runtime/pgAdmin4"
 
   cp -a docs web "${pkgdir}/usr/lib/pgadmin4"
   cp -a venv "${pkgdir}/usr/lib/pgadmin4/venv"
@@ -63,15 +64,13 @@
   ### 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.7/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload"
+  ln -s /usr/lib/python${PYTHONVERSION}/lib-dynload "${pkgdir}/usr/lib/pgadmin4/venv/lib/python${PYTHONVERSION}/lib-dynload"
 
   ### Launcher
-
   install -Dm 644 runtime/pgAdmin4-0.png "${pkgdir}/usr/share/icons/hicolor/256x256/apps/pgAdmin4.png"
   install -Dm 644 runtime/pgAdmin4-1.png "${pkgdir}/usr/share/icons/hicolor/48x48/apps/pgAdmin4.png"
   install -Dm 644 runtime/pgAdmin4-2.png "${pkgdir}/usr/share/icons/hicolor/32x32/apps/pgAdmin4.png"
   install -Dm 644 runtime/pgAdmin4-3.png "${pkgdir}/usr/share/icons/hicolor/16x16/apps/pgAdmin4.png"
-
   install -Dm 644 "${srcdir}/pgAdmin4.desktop" -t "${pkgdir}/usr/share/applications"
 
   install -D /dev/stdin "${pkgdir}/usr/bin/pgadmin4" <<END

Modified: pgAdmin4.desktop
===================================================================
--- pgAdmin4.desktop	2018-09-09 14:45:14 UTC (rev 378905)
+++ pgAdmin4.desktop	2018-09-09 14:48:45 UTC (rev 378906)
@@ -4,7 +4,7 @@
 Exec=/usr/lib/pgadmin4/runtime/pgAdmin4
 Icon=pgAdmin4
 Type=Application
-Categories=Application;Development;
+Categories=Application;Development;Database;
 MimeType=text/html
 DocPath=/usr/lib/pgadmin4/docs/en_US/_build/html/index.html
 Comment=PostgreSQL Tools