diff options
| author | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@endefensadelsl.org> | 2013-06-20 15:25:33 -0300 |
| commit | cebf33d7109e0157a80f34d6136e212f0a28d274 (patch) | |
| tree | a6464302c970f72581105b50ff0896e1f56def3d /extra/x2goserver/PKGBUILD | |
| parent | 1a65caeb80e2cc8c7b39262d72255124d0c8614e (diff) | |
| parent | 5cb95ceee39e4691f768ea2fef60b8a106e92209 (diff) | |
Merge branch 'master' of gparabola:abslibre-mips64el
Diffstat (limited to 'extra/x2goserver/PKGBUILD')
| -rw-r--r-- | extra/x2goserver/PKGBUILD | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/extra/x2goserver/PKGBUILD b/extra/x2goserver/PKGBUILD index 44e9d531f..298458759 100644 --- a/extra/x2goserver/PKGBUILD +++ b/extra/x2goserver/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 180593 2013-03-24 09:34:13Z andyrtr $ +# $Id: PKGBUILD 186036 2013-05-20 18:09:21Z andyrtr $ # Maintainer: AndyRTR <andyrtr@archlinux.org> # Contributor: Gerhard Brauer <gerbra@archlinux.de> @@ -7,8 +7,8 @@ # Contributor: Milan Knížek <knizek@volny.cz> pkgname=x2goserver -pkgver=4.0.0.1 -pkgrel=1 +pkgver=4.0.0.2 +pkgrel=2 pkgdesc="Open source terminal server" arch=('i686' 'x86_64' 'mips64el') url="http://www.x2go.org/" @@ -19,13 +19,20 @@ makedepends=('man2html') options=('emptydirs') install=x2goserver.install backup=('etc/x2go/x2goserver.conf' 'etc/x2go/x2gosql/sql') -source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz x2goserver.service) -md5sums=('85dc2a2d52e82eead744a51007155ff9' - 'b09799f9203150dc1277a56058be48a8') +source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz + x2goserver.service + revert.patch) +md5sums=('6b8cecfdd31a8877203f50d3666c265f' + 'f76081c01e40b6206895d194dc949707' + 'c487c31e7c0aa9a73323313007497764') build() { cd "${srcdir}/${pkgname}-${pkgver}" + # revert an upstream commit that breaks sessions showing up + # http://code.x2go.org/gitweb?p=x2goserver.git;a=commitdiff;h=011d14ae076ba6fec96cd1e019c4f82444ab0f9f + patch -Rp1 -i ${srcdir}/revert.patch + # -r option does not exist in Arch linux # (However, html man pages do not get installed anyway...) for Makefile in $(find . -type f -name Makefile); do @@ -43,15 +50,14 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make -j1 PREFIX=/usr DESTDIR="$pkgdir" install + make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install # systemd service file - only runs x2gocleansessions install -Dm 644 "$srcdir/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service" # X2go homedir + printing spool dir - #install -dm 755 $pkgdir/var/lib/x2go install -dm 770 $pkgdir/var/lib/x2go - install -dm 755 $pkgdir/var/spool/x2go + install -dm 770 $pkgdir/var/spool/x2go # load fuse module at system start install -dm755 $pkgdir/lib/modules-load.d |