[arch-commits] Commit in x2goserver/trunk (PKGBUILD x2goserver-mimetype.patch)

[Andreas Radke]

    Date: Saturday, January 4, 2014 @ 22:17:32
  Author: andyrtr
Revision: 203174

prepare next build

Added:
  x2goserver/trunk/x2goserver-mimetype.patch
Modified:
  x2goserver/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   35 ++++++++++++++++++++++++-----------
 x2goserver-mimetype.patch |   14 ++++++++++++++
 2 files changed, 38 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-01-04 17:28:52 UTC (rev 203173)
+++ PKGBUILD	2014-01-04 21:17:32 UTC (rev 203174)
@@ -12,24 +12,25 @@
 pkgdesc="Open source terminal server"
 arch=('i686' 'x86_64')
 url="http://www.x2go.org/"
-license=('GPL')
+license=('GPL2')
 # see x2goserver.spec
-depends=('perl-config-simple' 'perl-dbd-sqlite' 'perl-file-basedir'
-         'python' 'xorg-xauth' 'desktop-file-utils' 'shared-mime-info'
+depends=(#'perl-config-simple' 'perl-file-basedir'
+         #'python' 'xorg-xauth' 
+
          # For x2goruncommand - for now
          'bc'
          # For netstat in x2goresume-session
          'net-tools'
          'openssh'
-         # perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) ?
          'perl-file-readbackwards'
          # We need a database
+         'perl-dbd-sqlite' 
          # For killall in x2gosuspend-session
          'psmisc'
          # For x2goshowblocks
          'lsof'
          # For x2godbadmin
-		 #'pwgen'
+		 'pwgen' # in community
          # For printing, file-sharing
          'sshfs'
          # For /etc/sudoers.d
@@ -38,25 +39,35 @@
          # For /etc/X11/Xresources
          'xorg-xinit'
          'xorg-fonts-misc'
-         #'shadow'-utils
+         'shadow'
+         
+         # for post install actions
+         'desktop-file-utils'
+         'shared-mime-info'
+
          #x2goserver-extensions
          #x2goserver-xsession
          #x2goserver-fmbindings
          #x2goserver-printing
 )
-makedepends=('man2html')
+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
-        x2goserver.service)
+        x2goserver.service
+        x2goserver-mimetype.patch)
 md5sums=('d6cd2f7f11e96097d8d0454a89accc4e'
-         'f76081c01e40b6206895d194dc949707')
+         'f76081c01e40b6206895d194dc949707'
+         '2cfac1cd78080a3a1f20c29b2d10a338')
 
 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
@@ -68,8 +79,10 @@
   for Makefile in $(find . -type f -name Makefile); do
     sed -i "s:-o root -g root ::g" $Makefile
   done
-
-  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir"
+  # Do not ship xsession - Debian specific
+#  sed -i -e '/xsession/s/^/#/' Makefile
+  
+  make PREFIX=/usr SBINDIR=/usr/bin DESTDIR="$pkgdir" PERL_INSTALLDIRS=vendor
 }
 
 package() {

Added: x2goserver-mimetype.patch
===================================================================
--- x2goserver-mimetype.patch	                        (rev 0)
+++ x2goserver-mimetype.patch	2014-01-04 21:17:32 UTC (rev 203174)
@@ -0,0 +1,14 @@
+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
+