Date: Sunday, April 22, 2012 @ 13:09:43 Author: andyrtr Revision: 156664
upgpkg: nx 3.5.0.12-2 fix some file locations and add a few more symlinks; FS#29555 Modified: nx/trunk/PKGBUILD ----------+ PKGBUILD | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-04-22 16:04:02 UTC (rev 156663) +++ PKGBUILD 2012-04-22 17:09:43 UTC (rev 156664) @@ -4,7 +4,7 @@ pkgbase=nx pkgname=('libxcomp' 'nxproxy' 'nx-x11' 'nx-xcompext' 'nxagent' 'nx-headers') pkgver=3.5.0.12 -pkgrel=1 +pkgrel=2 arch=('i686' 'x86_64') url="http://wiki.x2go.org/" license=('GPL') @@ -41,8 +41,11 @@ pkgdesc="NX proxy" depends=('libxcomp') - install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx} - cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx + install -dm755 ${pkgdir}/usr/{bin,share/man/man1,lib/nx/bin} + cp -a ${srcdir}/fakeinstall/usr/bin/nxproxy ${pkgdir}/usr/lib/nx/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxproxy . + # the wrapper cp -a ${srcdir}/nx-libs_$pkgver/bin/nxproxy ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxproxy @@ -55,7 +58,6 @@ depends=('libxcomp' 'nx-x11') 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 @@ -69,10 +71,13 @@ 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/bin} cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/lib*/nx/lib*.so* ${pkgdir}/usr/lib/nx - cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx + cp -a ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxauth ${pkgdir}/usr/lib/nx/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxauth . + # the wrapper cp -a ${srcdir}/nx-libs_$pkgver/bin/nxauth ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxauth @@ -85,8 +90,11 @@ pkgdesc="NX X server based on Xnest" depends=('nx-xcompext') - install -dm755 ${pkgdir}/usr/{bin,lib/nx} - cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx + install -dm755 ${pkgdir}/usr/{bin,lib/nx/bin} + cp -aR ${srcdir}/fakeinstall/usr/lib/NX3/bin/nxagent ${pkgdir}/usr/lib/nx/bin + cd ${pkgdir}/usr/lib/nx + ln -sv /usr/lib/nx/bin/nxagent . + # the wrapper cp -a ${srcdir}/nx-libs_$pkgver/bin/nxagent ${pkgdir}/usr/bin chmod +x ${pkgdir}/usr/bin/nxagent