[arch-commits] Commit in x2goserver/repos (8 files)

Andreas Radke andyrtr at archlinux.org
Wed Oct 8 19:03:51 UTC 2014


    Date: Wednesday, October 8, 2014 @ 21:03:49
  Author: andyrtr
Revision: 224114

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

Added:
  x2goserver/repos/extra-i686/PKGBUILD
    (from rev 224113, x2goserver/trunk/PKGBUILD)
  x2goserver/repos/extra-i686/x2goserver.install
    (from rev 224113, x2goserver/trunk/x2goserver.install)
  x2goserver/repos/extra-x86_64/PKGBUILD
    (from rev 224113, x2goserver/trunk/PKGBUILD)
  x2goserver/repos/extra-x86_64/x2goserver.install
    (from rev 224113, x2goserver/trunk/x2goserver.install)
Deleted:
  x2goserver/repos/extra-i686/PKGBUILD
  x2goserver/repos/extra-i686/x2goserver.install
  x2goserver/repos/extra-x86_64/PKGBUILD
  x2goserver/repos/extra-x86_64/x2goserver.install

---------------------------------+
 /PKGBUILD                       |  212 ++++++++++++++++++++++++++++++++++++++
 /x2goserver.install             |  138 ++++++++++++++++++++++++
 extra-i686/PKGBUILD             |  106 -------------------
 extra-i686/x2goserver.install   |   69 ------------
 extra-x86_64/PKGBUILD           |  106 -------------------
 extra-x86_64/x2goserver.install |   69 ------------
 6 files changed, 350 insertions(+), 350 deletions(-)

Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2014-10-08 19:03:29 UTC (rev 224113)
+++ extra-i686/PKGBUILD	2014-10-08 19:03:49 UTC (rev 224114)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-# Contributor: Markus Opitz <mastero23 at gmail dot com>
-# Contributor: Milan Knížek <knizek at volny.cz>
-
-pkgname=x2goserver
-pkgver=4.0.1.17
-pkgrel=1
-pkgdesc="Open source terminal server"
-arch=('i686' 'x86_64')
-url="http://www.x2go.org/"
-license=('GPL2')
-# see x2goserver.spec
-depends=(#'python' 'xorg-xauth' 
-
-         # For x2goruncommand - for now
-         'bc'
-         # For netstat in x2goresume-session
-         'net-tools'
-         'openssh'
-         'perl-file-readbackwards'
-         # We need a database
-         'perl-dbd-sqlite' 
-         # For killall in x2gosuspend-session
-         'psmisc'
-         # For x2goshowblocks
-         'lsof'
-         # For x2godbadmin
-		 'pwgen' # in community
-         # For printing, file-sharing
-         'sshfs'
-         # For /etc/sudoers.d
-         'sudo'
-         'x2go-agent'
-         # For /etc/X11/Xresources
-         'xorg-xinit'
-         'xorg-fonts-misc'
-         'shadow'
-         
-         # for post install actions
-         'desktop-file-utils'
-         'shared-mime-info'
-         
-         'perl-capture-tiny'
-         'perl-config-simple'
-         'perl-file-basedir' # FS#38551
-         
-         'xorg-xwininfo' # FS#38558
-         
-         #x2goserver-extensions
-         #x2goserver-xsession
-         #x2goserver-fmbindings
-         #x2goserver-printing
-)
-makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
-#optdepends=('cups-x2go: printing support')
-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)
-md5sums=('5b02aed3cb2bcdcfa94a22edce180dab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # -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
-    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
-    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
-  done
-
-  # fix some Makefile permission options
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i "s:-o root -g root ::g" $Makefile
-  done
-  # Do not ship xsession - Debian specific
-  sed -i -e '/xsession/s/^/#/' Makefile
-  
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
-
-  # systemd service file 
-  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
-  
-  # X2go homedir + printing spool dir
-  install -dm 770 $pkgdir/var/lib/x2go
-  install -dm 770 $pkgdir/var/spool/x2go
-  
-  # load fuse module at system start
-  install -dm755 $pkgdir/usr/lib/modules-load.d
-  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
-
-  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
-
-  # fix permission
-  chmod 750 ${pkgdir}/etc/sudoers.d
-}

Copied: x2goserver/repos/extra-i686/PKGBUILD (from rev 224113, x2goserver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD	                        (rev 0)
+++ extra-i686/PKGBUILD	2014-10-08 19:03:49 UTC (rev 224114)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek at volny.cz>
+
+pkgname=x2goserver
+pkgver=4.0.1.18
+pkgrel=1
+pkgdesc="Open source terminal server"
+arch=('i686' 'x86_64')
+url="http://www.x2go.org/"
+license=('GPL2')
+# see x2goserver.spec
+depends=(#'python' 'xorg-xauth' 
+
+         # For x2goruncommand - for now
+         'bc'
+         # For netstat in x2goresume-session
+         'net-tools'
+         'openssh'
+         'perl-file-readbackwards'
+         # We need a database
+         'perl-dbd-sqlite' 
+         # For killall in x2gosuspend-session
+         'psmisc'
+         # For x2goshowblocks
+         'lsof'
+         # For x2godbadmin
+		 'pwgen' # in community
+         # For printing, file-sharing
+         'sshfs'
+         # For /etc/sudoers.d
+         'sudo'
+         'x2go-agent'
+         # For /etc/X11/Xresources
+         'xorg-xinit'
+         'xorg-fonts-misc'
+         'shadow'
+         
+         # for post install actions
+         'desktop-file-utils'
+         'shared-mime-info'
+         
+         'perl-capture-tiny'
+         'perl-config-simple'
+         'perl-file-basedir' # FS#38551
+         
+         'xorg-xwininfo' # FS#38558
+         
+         #x2goserver-extensions
+         #x2goserver-xsession
+         #x2goserver-fmbindings
+         #x2goserver-printing
+)
+makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
+#optdepends=('cups-x2go: printing support')
+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)
+md5sums=('e7bd91b82d7a911d04386e09c4650004')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # -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
+    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+  done
+
+  # fix some Makefile permission options
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i "s:-o root -g root ::g" $Makefile
+  done
+  # Do not ship xsession - Debian specific
+  sed -i -e '/xsession/s/^/#/' Makefile
+  
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
+
+  # systemd service file 
+  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  
+  # X2go homedir + printing spool dir
+  install -dm 770 $pkgdir/var/lib/x2go
+  install -dm 770 $pkgdir/var/spool/x2go
+  
+  # load fuse module at system start
+  install -dm755 $pkgdir/usr/lib/modules-load.d
+  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
+
+  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
+
+  # fix permission
+  chmod 750 ${pkgdir}/etc/sudoers.d
+}

Deleted: extra-i686/x2goserver.install
===================================================================
--- extra-i686/x2goserver.install	2014-10-08 19:03:29 UTC (rev 224113)
+++ extra-i686/x2goserver.install	2014-10-08 19:03:49 UTC (rev 224114)
@@ -1,69 +0,0 @@
-pre_install() {
-  cat << 'EOM'
-  ==> Use the following command to setup sqlite database:
-  ==> x2godbadmin --createdb
-EOM
-}
-
-
-post_install() {
-
-  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
-
-  # x2gouser
-  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
-    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
-  else
-    groupadd -g 111 x2gouser &> /dev/null
-  fi
-
-  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
-  fi 
-
-  # x2goprint
-  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
-    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
-  else
-    groupadd -g 112 x2goprint &> /dev/null
-  fi
-
-  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
-  fi
-  
-  # fix permissions - see INSTALL file
-  chown -R x2goprint:x2goprint /var/spool/x2go
-  chmod 0770 /var/spool/x2go
-    
-  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
-  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
-  
-  chown root:x2goprint /usr/bin/x2goprint
-  chmod 2755 /usr/bin/x2goprint
-  
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-    userdel x2gouser &> /dev/null
-    userdel x2goprint &> /dev/null
-    groupdel x2gouser &> /dev/null || /bin/true
-    groupdel x2goprint &> /dev/null || /bin/true
-    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
-    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
-}
-
-post_remove() {
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}

Copied: x2goserver/repos/extra-i686/x2goserver.install (from rev 224113, x2goserver/trunk/x2goserver.install)
===================================================================
--- extra-i686/x2goserver.install	                        (rev 0)
+++ extra-i686/x2goserver.install	2014-10-08 19:03:49 UTC (rev 224114)
@@ -0,0 +1,69 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}
+
+
+post_install() {
+
+  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
+
+  # x2gouser
+  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
+    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
+  else
+    groupadd -g 111 x2gouser &> /dev/null
+  fi
+
+  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
+  fi 
+
+  # x2goprint
+  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
+    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
+  else
+    groupadd -g 112 x2goprint &> /dev/null
+  fi
+
+  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
+  fi
+  
+  # fix permissions - see INSTALL file
+  chown -R x2goprint:x2goprint /var/spool/x2go
+  chmod 0770 /var/spool/x2go
+    
+  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
+  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+  
+  chown root:x2goprint /usr/bin/x2goprint
+  chmod 2755 /usr/bin/x2goprint
+  
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    userdel x2gouser &> /dev/null
+    userdel x2goprint &> /dev/null
+    groupdel x2gouser &> /dev/null || /bin/true
+    groupdel x2goprint &> /dev/null || /bin/true
+    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
+    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
+}
+
+post_remove() {
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}

Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2014-10-08 19:03:29 UTC (rev 224113)
+++ extra-x86_64/PKGBUILD	2014-10-08 19:03:49 UTC (rev 224114)
@@ -1,106 +0,0 @@
-# $Id$
-# Maintainer: AndyRTR <andyrtr at archlinux.org>
-
-# Contributor: Gerhard Brauer <gerbra at archlinux.de>
-# Contributor: Richard Murri <admin at richardmurri.com>
-# Contributor: Markus Opitz <mastero23 at gmail dot com>
-# Contributor: Milan Knížek <knizek at volny.cz>
-
-pkgname=x2goserver
-pkgver=4.0.1.17
-pkgrel=1
-pkgdesc="Open source terminal server"
-arch=('i686' 'x86_64')
-url="http://www.x2go.org/"
-license=('GPL2')
-# see x2goserver.spec
-depends=(#'python' 'xorg-xauth' 
-
-         # For x2goruncommand - for now
-         'bc'
-         # For netstat in x2goresume-session
-         'net-tools'
-         'openssh'
-         'perl-file-readbackwards'
-         # We need a database
-         'perl-dbd-sqlite' 
-         # For killall in x2gosuspend-session
-         'psmisc'
-         # For x2goshowblocks
-         'lsof'
-         # For x2godbadmin
-		 'pwgen' # in community
-         # For printing, file-sharing
-         'sshfs'
-         # For /etc/sudoers.d
-         'sudo'
-         'x2go-agent'
-         # For /etc/X11/Xresources
-         'xorg-xinit'
-         'xorg-fonts-misc'
-         'shadow'
-         
-         # for post install actions
-         'desktop-file-utils'
-         'shared-mime-info'
-         
-         'perl-capture-tiny'
-         'perl-config-simple'
-         'perl-file-basedir' # FS#38551
-         
-         'xorg-xwininfo' # FS#38558
-         
-         #x2goserver-extensions
-         #x2goserver-xsession
-         #x2goserver-fmbindings
-         #x2goserver-printing
-)
-makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
-#optdepends=('cups-x2go: printing support')
-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)
-md5sums=('5b02aed3cb2bcdcfa94a22edce180dab')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  # -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
-    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
-    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
-  done
-
-  # fix some Makefile permission options
-  for Makefile in $(find . -type f -name Makefile); do
-    sed -i "s:-o root -g root ::g" $Makefile
-  done
-  # Do not ship xsession - Debian specific
-  sed -i -e '/xsession/s/^/#/' Makefile
-  
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
-
-  # systemd service file 
-  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
-  
-  # X2go homedir + printing spool dir
-  install -dm 770 $pkgdir/var/lib/x2go
-  install -dm 770 $pkgdir/var/spool/x2go
-  
-  # load fuse module at system start
-  install -dm755 $pkgdir/usr/lib/modules-load.d
-  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
-
-  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
-  install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
-
-  # fix permission
-  chmod 750 ${pkgdir}/etc/sudoers.d
-}

Copied: x2goserver/repos/extra-x86_64/PKGBUILD (from rev 224113, x2goserver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD	                        (rev 0)
+++ extra-x86_64/PKGBUILD	2014-10-08 19:03:49 UTC (rev 224114)
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+
+# Contributor: Gerhard Brauer <gerbra at archlinux.de>
+# Contributor: Richard Murri <admin at richardmurri.com>
+# Contributor: Markus Opitz <mastero23 at gmail dot com>
+# Contributor: Milan Knížek <knizek at volny.cz>
+
+pkgname=x2goserver
+pkgver=4.0.1.18
+pkgrel=1
+pkgdesc="Open source terminal server"
+arch=('i686' 'x86_64')
+url="http://www.x2go.org/"
+license=('GPL2')
+# see x2goserver.spec
+depends=(#'python' 'xorg-xauth' 
+
+         # For x2goruncommand - for now
+         'bc'
+         # For netstat in x2goresume-session
+         'net-tools'
+         'openssh'
+         'perl-file-readbackwards'
+         # We need a database
+         'perl-dbd-sqlite' 
+         # For killall in x2gosuspend-session
+         'psmisc'
+         # For x2goshowblocks
+         'lsof'
+         # For x2godbadmin
+		 'pwgen' # in community
+         # For printing, file-sharing
+         'sshfs'
+         # For /etc/sudoers.d
+         'sudo'
+         'x2go-agent'
+         # For /etc/X11/Xresources
+         'xorg-xinit'
+         'xorg-fonts-misc'
+         'shadow'
+         
+         # for post install actions
+         'desktop-file-utils'
+         'shared-mime-info'
+         
+         'perl-capture-tiny'
+         'perl-config-simple'
+         'perl-file-basedir' # FS#38551
+         
+         'xorg-xwininfo' # FS#38558
+         
+         #x2goserver-extensions
+         #x2goserver-xsession
+         #x2goserver-fmbindings
+         #x2goserver-printing
+)
+makedepends=('man2html' 'perl-extutils-makemaker' 'systemd')
+#optdepends=('cups-x2go: printing support')
+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)
+md5sums=('e7bd91b82d7a911d04386e09c4650004')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  # -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
+    sed -i 's@(MAN2HTML_BIN) -r @(MAN2HTML_BIN) < @g' $Makefile
+    sed -i 's@ \$(MAN2HTML_SRC)/@ < \$(MAN2HTML_SRC)/@g' $Makefile
+  done
+
+  # fix some Makefile permission options
+  for Makefile in $(find . -type f -name Makefile); do
+    sed -i "s:-o root -g root ::g" $Makefile
+  done
+  # Do not ship xsession - Debian specific
+  sed -i -e '/xsession/s/^/#/' Makefile
+  
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make -j1 PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" install
+
+  # systemd service file 
+  install -Dm 644 "$srcdir/${pkgname}-${pkgver}/x2goserver.service" "$pkgdir/usr/lib/systemd/system/x2goserver.service"
+  
+  # X2go homedir + printing spool dir
+  install -dm 770 $pkgdir/var/lib/x2go
+  install -dm 770 $pkgdir/var/spool/x2go
+  
+  # load fuse module at system start
+  install -dm755 $pkgdir/usr/lib/modules-load.d
+  echo "fuse" > $pkgdir/usr/lib/modules-load.d/x2goserver.conf
+
+  install -dm 755 "${pkgdir}/usr/share/doc/${pkgname}"
+  install -m 644 "ChangeLog" "${pkgdir}/usr/share/doc/${pkgname}/"
+
+  # fix permission
+  chmod 750 ${pkgdir}/etc/sudoers.d
+}

Deleted: extra-x86_64/x2goserver.install
===================================================================
--- extra-x86_64/x2goserver.install	2014-10-08 19:03:29 UTC (rev 224113)
+++ extra-x86_64/x2goserver.install	2014-10-08 19:03:49 UTC (rev 224114)
@@ -1,69 +0,0 @@
-pre_install() {
-  cat << 'EOM'
-  ==> Use the following command to setup sqlite database:
-  ==> x2godbadmin --createdb
-EOM
-}
-
-
-post_install() {
-
-  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
-
-  # x2gouser
-  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
-    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
-  else
-    groupadd -g 111 x2gouser &> /dev/null
-  fi
-
-  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
-  fi 
-
-  # x2goprint
-  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
-    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
-  else
-    groupadd -g 112 x2goprint &> /dev/null
-  fi
-
-  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
-    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
-  else
-    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
-  fi
-  
-  # fix permissions - see INSTALL file
-  chown -R x2goprint:x2goprint /var/spool/x2go
-  chmod 0770 /var/spool/x2go
-    
-  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
-  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
-  
-  chown root:x2goprint /usr/bin/x2goprint
-  chmod 2755 /usr/bin/x2goprint
-  
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-    userdel x2gouser &> /dev/null
-    userdel x2goprint &> /dev/null
-    groupdel x2gouser &> /dev/null || /bin/true
-    groupdel x2goprint &> /dev/null || /bin/true
-    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
-    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
-}
-
-post_remove() {
-    update-desktop-database -q
-    update-mime-database usr/share/mime &> /dev/null
-}

Copied: x2goserver/repos/extra-x86_64/x2goserver.install (from rev 224113, x2goserver/trunk/x2goserver.install)
===================================================================
--- extra-x86_64/x2goserver.install	                        (rev 0)
+++ extra-x86_64/x2goserver.install	2014-10-08 19:03:49 UTC (rev 224114)
@@ -0,0 +1,69 @@
+pre_install() {
+  cat << 'EOM'
+  ==> Use the following command to setup sqlite database:
+  ==> x2godbadmin --createdb
+EOM
+}
+
+
+post_install() {
+
+  # Make sure the group and user "x2gouser"(111) +"x2goprint"(112) exists on this system and have the correct values
+
+  # x2gouser
+  if grep -q "^x2gouser:" /etc/group &> /dev/null ; then
+    groupmod -g 111 -n x2gouser x2gouser &> /dev/null
+  else
+    groupadd -g 111 x2gouser &> /dev/null
+  fi
+
+  if grep -q "^x2gouser:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser x2gouser &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoUser user" -M -d /var/lib/x2go -u 111 -g x2gouser -r x2gouser &> /dev/null
+  fi 
+
+  # x2goprint
+  if grep -q "^x2goprint:" /etc/group &> /dev/null ; then
+    groupmod -g 112 -n x2goprint x2goprint &> /dev/null
+  else
+    groupadd -g 112 x2goprint &> /dev/null
+  fi
+
+  if grep -q "^x2goprint:" /etc/passwd 2> /dev/null ; then
+    usermod -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint x2goprint &> /dev/null
+  else
+    useradd -s /usr/bin/false -c "X2GoPrint user" -M -d /var/spool/x2go -u 112 -g x2goprint -r x2goprint &> /dev/null
+  fi
+  
+  # fix permissions - see INSTALL file
+  chown -R x2goprint:x2goprint /var/spool/x2go
+  chmod 0770 /var/spool/x2go
+    
+  chown root:x2gouser /usr/lib/x2go/x2gosqlitewrapper
+  chmod 2755 /usr/lib/x2go/x2gosqlitewrapper
+  
+  chown root:x2goprint /usr/bin/x2goprint
+  chmod 2755 /usr/bin/x2goprint
+  
+  update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+    userdel x2gouser &> /dev/null
+    userdel x2goprint &> /dev/null
+    groupdel x2gouser &> /dev/null || /bin/true
+    groupdel x2goprint &> /dev/null || /bin/true
+    rm -rf /var/lib/x2go/* &> /dev/null || /bin/true
+    rm -rf /var/spool/x2go/* &> /dev/null || /bin/true
+}
+
+post_remove() {
+    update-desktop-database -q
+    update-mime-database usr/share/mime &> /dev/null
+}



More information about the arch-commits mailing list