[arch-commits] Commit in nx/trunk (PKGBUILD)

[andyrtr at archlinux.org]

    Date: Saturday, April 21, 2012 @ 17:06:35
  Author: andyrtr
Revision: 156611

add missing libXcompshad libs; install libs to a 2nd place just for testing now

Modified:
  nx/trunk/PKGBUILD

----------+
 PKGBUILD |   16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-21 17:49:44 UTC (rev 156610)
+++ PKGBUILD	2012-04-21 21:06:35 UTC (rev 156611)
@@ -4,11 +4,11 @@
 pkgbase=nx
 pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers')
 pkgver=3.5.0.12
-pkgrel=0.4
+pkgrel=0.5
 arch=('i686' 'x86_64')
 url="http://wiki.x2go.org/"
 license=('GPL')
-options=('!makeflags')
+#options=('!makeflags')
 makedepends=('libjpeg-turbo' 'libpng' 'bash' 'perl' # runtime dependencies from subpackages
              'xproto' 'freetype2' 'libxaw' 'libxrender' 'libxp' 'libxpm' 'libxdamage' 'libxrandr' 'libxcomposite' 'libxtst' 'xorg-sessreg' # makedepends
              )
@@ -69,8 +69,11 @@
   pkgdesc="NX-X11 lib for the NX framework"
   depends=('libxcomp')
 	
-  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+#  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx}
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/bin,usr/lib/nx/lib}
   cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx
+  cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx/lib
+
   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
@@ -89,6 +92,13 @@
   # the wrapper
   cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin
   chmod +x ${pkgdir}/usr/bin/nxagent
+  # required nxcompshad libs
+  cp -a ${srcdir}/nx-libs_$pkgver/nxcompshad/libXcompshad.so.3.5.0 ${pkgdir}/usr/lib/nx
+  cd ${pkgdir}/usr/lib/nx
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so.3
+  ln -sv libXcompshad.so.3.5.0 libXcompshad.so
+  cd ${pkgdir}/usr/lib/
+  ln -sv /usr/lib/nx/libXcompshad.so{,.3,.3.5.0} .
 }
 
 package_nx-headers() {