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

[Andreas Radke]

    Date: Friday, May 29, 2015 @ 22:20:09
  Author: andyrtr
Revision: 239883

upgpkg: x2goclient 4.0.4.0-1

upstream update 4.0.4.0; split out x2goplugin and x2goplugin-provider pkg

Modified:
  x2goclient/trunk/PKGBUILD

----------+
 PKGBUILD |   57 ++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 46 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-29 20:15:29 UTC (rev 239882)
+++ PKGBUILD	2015-05-29 20:20:09 UTC (rev 239883)
@@ -3,33 +3,68 @@
 # Contributor: Gerhard Brauer <gerbra at archlinux.de>
 # Contributor: Richard Murri <admin at richardmurri.com>
 
-pkgname=x2goclient
-pkgver=4.0.3.2
+pkgbase=x2goclient
+pkgname=('x2goclient' 'x2goplugin' 'x2goplugin-provider')
+pkgver=4.0.4.0
 pkgrel=1
-pkgdesc="x2go qt4 client"
 arch=('i686' 'x86_64')
 license=('GPL2')
 url="http://www.x2go.org"
-depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
-#makedepends=('man2html')
-install=x2goclient.install
+makedepends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
 source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz{,.asc})
-sha256sums=('f65a70463eae3d6d9fe6e4379f4ffacda50080a11f196d2792742f5b67fa0c6f'
+sha256sums=('86d05ce10039fe0a965cdc55086e00f4f3abc573a96f128b92f87081b7251657'
           'SKIP')
 validpgpkeys=('9BFBAEE86C0AA5FFBF2207829AF46B3025771B31'  # Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
               '1AD23D1B8F087A35AB74BDE9F4A7678C9C6B0B2B') #  "X2go Git Administrator <git-admin at x2go.org>"
 
+prepare() {
+  cd ${pkgname}-${pkgver}
+  sed -i "s:-o root -g root ::" Makefile
+}
+
 build() {
   cd ${pkgname}-${pkgver}
-  sed -i "s:-o root -g root ::" Makefile
+# make -qp | awk -F':' '/^[a-zA-Z0-9][^$#\/\t=]*:([^=]|$)/ {split($1,A,/ /);for(i in A)print A[i]}' | grep ^install
+# return 1
+
   make PREFIX=/usr
   make PREFIX=/usr build_man # target broken and making the build hang
+
 #  make PREFIX=/usr build_pluginprovider
 #  make PREFIX=/usr build_client 
 #  make PREFIX=/usr build_plugin
 }
 
-package() {
-  cd ${pkgname}-${pkgver}
-  make PREFIX=/usr DESTDIR="$pkgdir" install
+package_x2goclient() {
+  
+  pkgdesc="a graphical client (Qt4) for the X2Go system"
+  depends=('qt4' 'libldap' 'libcups' 'nxproxy' 'libssh' 'libxpm' 'hicolor-icon-theme' 'xdg-utils')
+  install=x2goclient.install
+
+  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 
+}