[arch-commits] Commit in x2goserver/trunk (3 files)

[Andreas Radke]

    Date: Monday, January 6, 2014 @ 22:16:27
  Author: andyrtr
Revision: 203256

upgpkg: x2goserver 4.0.1.11-1

upstream update 4.0.1.11; use upstream service file; drop mimetype patch that went upstream and remove Debian specific Xsession files

Modified:
  x2goserver/trunk/PKGBUILD
Deleted:
  x2goserver/trunk/x2goserver-mimetype.patch
  x2goserver/trunk/x2goserver.service

---------------------------+
 PKGBUILD                  |   19 ++++++-------------
 x2goserver-mimetype.patch |   14 --------------
 x2goserver.service        |   10 ----------
 3 files changed, 6 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-06 20:34:16 UTC (rev 203255)
+++ PKGBUILD	2014-01-06 21:16:27 UTC (rev 203256)
@@ -7,7 +7,7 @@
 # Contributor: Milan Knížek <knizek at volny.cz>
 
 pkgname=x2goserver
-pkgver=4.0.1.10
+pkgver=4.0.1.11
 pkgrel=1
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
@@ -55,19 +55,12 @@
 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
-        x2goserver-mimetype.patch)
-md5sums=('d6cd2f7f11e96097d8d0454a89accc4e'
-         'f76081c01e40b6206895d194dc949707'
-         '2cfac1cd78080a3a1f20c29b2d10a338')
+source=(http://code.x2go.org/releases/source/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('11f130f712d1d5910bb479b5eb599105')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # fix x2gofm.desktop mimetype
-  patch -Np1 -i ${srcdir}/x2goserver-mimetype.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
@@ -80,7 +73,7 @@
     sed -i "s:-o root -g root ::g" $Makefile
   done
   # Do not ship xsession - Debian specific
-#  sed -i -e '/xsession/s/^/#/' Makefile
+  sed -i -e '/xsession/s/^/#/' Makefile
   
   make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
 }
@@ -89,8 +82,8 @@
   cd "${srcdir}/${pkgname}-${pkgver}"
   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"
+  # 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

Deleted: x2goserver-mimetype.patch
===================================================================
--- x2goserver-mimetype.patch	2014-01-06 20:34:16 UTC (rev 203255)
+++ x2goserver-mimetype.patch	2014-01-06 21:16:27 UTC (rev 203256)
@@ -1,14 +0,0 @@
-diff -up x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype 
-x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop
---- x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop.mimetype	2014-01-03 10:27:31.167601207 -0700
-+++ x2goserver-4.0.1.10/x2goserver-fmbindings/share/applications/x2gofm.desktop	2014-01-03 10:28:15.184321072 -0700
-@@ -1,7 +1,7 @@
- [Desktop Entry]
- Encoding=UTF-8
- Name=x2gofm
--MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go
-+MimeType=application/sshfsdisk-x2go;application/sshfscdrom-x2go;application/sshfsremovable-x2go;
- Exec=x2gofm %f
- Type=Application
- Terminal=false
-

Deleted: x2goserver.service
===================================================================
--- x2goserver.service	2014-01-06 20:34:16 UTC (rev 203255)
+++ x2goserver.service	2014-01-06 21:16:27 UTC (rev 203256)
@@ -1,10 +0,0 @@
-[Unit]
-Description=x2go - remote desktop server
-After=syslog.target network.target
-
-[Service]
-ExecStart=/usr/bin/x2gocleansessions
-PIDFile=/run/x2goserver.pid
-
-[Install]
-WantedBy=multi-user.target