Wed Apr 18 00:01:47 UTC 2012

2 files changed, 38 insertions, 22 deletions

diff --git a/staging/nx-common/PKGBUILD b/staging/nx-common/PKGBUILD
index 8dd38842b..13b1f50d7 100644
--- a/staging/nx-common/PKGBUILD
+++ b/staging/nx-common/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156191 2012-04-15 14:20:58Z andyrtr $
+# $Id: PKGBUILD 156293 2012-04-16 18:22:30Z andyrtr $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributed: eliott <eliott@solarblue.net>, Andre Naumann <anaumann@SPARCed.org>
 
 pkgname=nx-common
 pkgver=3.5.0
-pkgrel=4.1
+pkgrel=4.2
 pkgdesc="NoMachine NX common package for client and server"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -36,10 +36,17 @@ build() {
 package() {
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
 
+
   # nxcompsh
   cd ${srcdir}/nxcompsh
-  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx # really needed?
+  cp -a libXcompsh.so* ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompsh.so{,.3,.3.5.0} .
+  # ^ really needed?
+
   # nxssh
   cd ${srcdir}/nxssh
-  install -D -m755 nxssh ${pkgdir}/usr/bin/nxssh
+  install -D -m755 nxssh ${pkgdir}/usr/lib/nx/bin/nxssh
+  cd ${pkgdir}/usr/bin
+  ln -sv /usr/lib/nx/bin/nxssh .
 }
diff --git a/staging/nx/PKGBUILD b/staging/nx/PKGBUILD
index a46c26b45..6b12d4490 100644
--- a/staging/nx/PKGBUILD
+++ b/staging/nx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 156194 2012-04-15 15:11:02Z andyrtr $
+# $Id: PKGBUILD 156297 2012-04-16 18:52:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.3
+pkgrel=0.4
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
@@ -30,9 +30,10 @@ package_libxcomp() {
   pkgdesc="NX X compression library"
   depends=('libjpeg-turbo' 'libpng' 'gcc-libs')
 	
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib
+  install -dm755 ${pkgdir}/usr/lib/nx/lib
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcomp.so* ${pkgdir}/usr/lib/nx/lib
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/lib/libXcomp.so{,.3,.3.5.0} .
 }
 
 package_nxproxy() {
@@ -40,9 +41,11 @@ package_nxproxy() {
   pkgdesc="NX proxy"
   depends=('libxcomp')
   
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/{bin,share/man/man1}
-  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/bin
+  install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx}
+  cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxproxy
   cp -a ${srcdir}/fakeinstall/usr/share/man/man1/nxproxy.1 ${pkgdir}/usr/share/man/man1
 }
 
@@ -51,20 +54,27 @@ package_nx-xcompext() {
   pkgdesc="Xcompext/Xcompshad library for NX"
   depends=('libxcomp' 'nx-x11')
 	
-  cd "${srcdir}/fakeinstall"
-  install -dm755 ${pkgdir}/usr/lib/
-  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib
+  install -dm755 ${pkgdir}/usr/lib/nx
+  #cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so* ${pkgdir}/usr/lib/nx
+  cp -a ${srcdir}/fakeinstall/usr/lib/nx/libXcompext.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompext.so.3.5.0 libXcompext.so.3
+  ln -sv libXcompext.so.3.5.0 libXcompext.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompext.so{,.3,.3.5.0} .
 }
 
 package_nx-x11() {
-  
+ 
   pkgdesc="NX-X11 lib for the NX framework"
   depends=('libxcomp')
 	
-  cd "${srcdir}/fakeinstall"
   install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
-  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/bin
+  cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxauth
   
   install -m 644 "$srcdir/nx-x11.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nx.conf"
 }
@@ -74,18 +84,17 @@ package_nxagent() {
   pkgdesc="NX X server based on Xnest"
   depends=('nx-xcompext')
 	
-  cd "${srcdir}/fakeinstall"
   install -dm755 ${pkgdir}/usr/{bin,lib/nx}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx
-  cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/nx/nxagent .
+  # the wrapper
+  cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
+  chmod +x ${pkgdir}/usr/bin/nxagent
 }
 
 package_nx-headers() {
 
   pkgdesc="NX headers"
   
-  cd "${srcdir}/fakeinstall"
   install -dm755 ${pkgdir}/usr/include/nx
   cp -aR ${srcdir}/fakeinstall/usr/include/nx/* ${pkgdir}/usr/include/nx
 }