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

[Andreas Radke via arch-commits]

    Date: Saturday, June 23, 2018 @ 20:37:32
  Author: andyrtr
Revision: 327505

upgpkg: x2goclient 4.1.2.0-1

upstream update 4.1.2.0

Modified:
  x2goclient/trunk/PKGBUILD

----------+
 PKGBUILD |   48 ++++++++++--------------------------------------
 1 file changed, 10 insertions(+), 38 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2018-06-23 20:17:58 UTC (rev 327504)
+++ PKGBUILD    2018-06-23 20:37:32 UTC (rev 327505)
@@ -3,19 +3,20 @@
 # Contributor: Gerhard Brauer <ger...@archlinux.de>
 # Contributor: Richard Murri <ad...@richardmurri.com>
 
-pkgbase=x2goclient
-pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
-pkgver=4.1.1.1
+pkgname=x2goclient
+pkgver=4.1.2.0
 pkgrel=1
 arch=('x86_64')
 license=('GPL2')
 url="http://www.x2go.org";
-makedepends=('qt4'
-             #'qt5-x11extras' 'qt5-tools' 'qt5-svg' 'phonon-qt5'
-             'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 
-             'man2html' 'hicolor-icon-theme' 'xdg-utils' 'xorg-xauth')
+pkgdesc="a graphical client (Qt4) for the X2Go system"
+makedepends=(#'qt5-x11extras' 'qt5-tools' 'qt5-svg' 'phonon-qt5'
+             'man2html' 'xdg-utils' 'xorg-xauth')
+depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 
'hicolor-icon-theme')
+# FS#48088
+optdepends=('xorg-xauth: may be required by X2goservers running a different 
linux distribution giving MIT-COOKIE errors')
 
source=(https://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha256sums=('e3fa40cc13d779b230d44087f7515ad57cd1cbd030c3430b1c222cb481e5f44b'
+sha256sums=('f687a3904c8c1ee507f283af6210964d9cd03d65bf3385b5cdab9affb58f31f4'
             'SKIP')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel 
<mike.gabr...@das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git 
Administrator <git-ad...@x2go.org>"
@@ -31,37 +32,8 @@
   make PREFIX=/usr build_man
 }
 
-package_x2goclient() {
+package() {
   
-  pkgdesc="a graphical client (Qt4) for the X2Go system"
-  depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 
'hicolor-icon-theme')
-  # FS#48088
-  optdepends=('xorg-xauth: may be required by X2goservers running a different 
linux distribution giving MIT-COOKIE errors')
-
   cd ${pkgbase}-${pkgver}
   make PREFIX=/usr DESTDIR="$pkgdir" install_client install_man
 }
-
-package_x2goplugin() {
-  pkgdesc="provides X2Go Client as QtBrowser-based Mozilla plugin"
-  depends=('qt4'  'libcups' 'nxproxy' 'libssh' 'libxpm')
-  
-  cd ${pkgbase}-${pkgver}
-  make PREFIX=/usr DESTDIR="$pkgdir" install_plugin
-}
-
-package_x2goplugin-provider() {
-  
-  pkgdesc="an example configuration for providing the X2Go Plugin via an 
Apache webserver"
-  depends=('apache')
-  backup=(etc/x2go/plugin-provider/x2goplugin.html
-          etc/x2go/x2goplugin-apache.conf
-          etc/httpd/conf/x2goplugin-apache.conf)
-       
-  cd ${pkgbase}-${pkgver}
-  make PREFIX=/usr DESTDIR="$pkgdir" install_pluginprovider
-  
-  install -dm755 ${pkgdir}/etc/httpd/conf
-  cd ${pkgdir}/etc/httpd/conf
-  ln -svf /etc/x2go/x2goplugin-apache.conf 
${pkgdir}/etc/httpd/conf/x2goplugin-apache.conf 
-}