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

[andyrtr at archlinux.org]

    Date: Monday, April 16, 2012 @ 14:15:05
  Author: andyrtr
Revision: 156290

upgpkg: nxclient 3.5.0.7-1.2

add its own ld.so.conf file; drop dep on nx-x11; use the same /usr/lib/nx dir as nx-x11

Added:
  nxclient/trunk/nxclient.ld.so.conf.d
Modified:
  nxclient/trunk/PKGBUILD
  nxclient/trunk/nxclient.install

-----------------------+
 PKGBUILD              |   36 +++++++++++++++++-------------------
 nxclient.install      |    2 +-
 nxclient.ld.so.conf.d |    1 +
 3 files changed, 19 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-16 15:58:43 UTC (rev 156289)
+++ PKGBUILD	2012-04-16 18:15:05 UTC (rev 156290)
@@ -4,25 +4,25 @@
 
 pkgname=nxclient
 pkgver=3.5.0.7
-pkgrel=1.1
+pkgrel=1.2
 pkgdesc="Nomachine's closed source client for NX servers"
 arch=('i686' 'x86_64')
 url="http://nomachine.com"
 license=('custom:nomachine')
-depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-x11' 'nx-common>=3.5.0-4.1' 'desktop-file-utils')
+depends=('libxext' 'libxft' 'xorg-xauth' 'libxcomp' 'nx-common>=3.5.0-4.1' 'desktop-file-utils')
 makedepends=('rpmextract' 'chrpath')
 optdepends=('cups: for printing support')
-[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key)
-[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228')
-[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key)
-[ "$CARCH" = "i686" ] &&  md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228')
+[ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.x86_64.rpm nomachine.key nxclient.ld.so.conf.d)
+[ "$CARCH" = "x86_64" ] && md5sums=('0648c2e36a14d5810e26d7d640d8382f' 'cb5df74aff5160eab9cd4313019ae228' '4faf0fbece74128729c77de7c67ee369')
+[ "$CARCH" = "i686" ] && source=(http://64.34.161.181/download/3.5.0/Linux/$pkgname-3.5.0-7.i386.rpm nomachine.key nxclient.ld.so.conf.d)
+[ "$CARCH" = "i686" ] &&  md5sums=('53e5b9b4a1096324e7d3dbd8ffb192a1' 'cb5df74aff5160eab9cd4313019ae228' '4faf0fbece74128729c77de7c67ee369')
 install=nxclient.install
 
 build() {
   cd ${srcdir}/
   rpmextract.sh *.rpm
-  sed -i -e 's:/usr/NX:/usr/lib/NX:g' etc/profile.d/nx.*
-  sed -i -e 's:/usr/NX:/usr/lib/NX:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
+  sed -i -e 's:/usr/NX:/usr/lib/nx:g' etc/profile.d/nx.*
+  sed -i -e 's:/usr/NX:/usr/lib/nx:g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
 }
 
 package() {
@@ -46,27 +46,25 @@
   rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
 
   # move files
-  install -dm755 ${pkgdir}/usr/{bin,lib}
-  cp -aR ${srcdir}/usr/NX ${pkgdir}/usr/lib
+  install -dm755 ${pkgdir}/{etc/ld.so.conf.d,usr/{bin,lib/nx}}
+  cp -aR ${srcdir}/usr/NX/* ${pkgdir}/usr/lib/nx
   # add symlinks
   cd ${pkgdir}/usr/bin
-  ln -sv /usr/lib/NX/bin/{nxclient,nxkill,nxprint,nxservice} .
+  ln -sv /usr/lib/nx/bin/{nxclient,nxkill,nxprint,nxservice} .
 
-  # move libs into proper ld.conf.so place provided by nx-x11
-  install -dm 755 ${pkgdir}/usr/lib/nx
-  cp -aR ${pkgdir}/usr/lib/NX/lib* ${pkgdir}/usr/lib/nx
-  rm -rf ${pkgdir}/usr/lib/NX/lib*
+  # install ld.so.conf.d file to allow the linker to load libs from custom location
+  install -m 644 "$srcdir/nxclient.ld.so.conf.d" "$pkgdir/etc/ld.so.conf.d/nxclient.conf"
 
   # add default key file
-  install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/NX/share/keys/server.id_dsa.key
+  install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/usr/lib/nx/share/keys/server.id_dsa.key
 
   # add license file
   mkdir -p ${pkgdir}/usr/share/licenses/nxclient
-  mv ${pkgdir}/usr/lib/NX/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE
+  mv ${pkgdir}/usr/lib/nx/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE
 
   # some cleanup
-  rm -rf ${pkgdir}/usr/lib/NX/share/{documents,cups}
+  rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups}
   
   # fix insecure rpath
-  chrpath -d "$pkgdir/usr/lib/NX/bin/nxclient"
+  chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient"
 }

Modified: nxclient.install
===================================================================
--- nxclient.install	2012-04-16 15:58:43 UTC (rev 156289)
+++ nxclient.install	2012-04-16 18:15:05 UTC (rev 156290)
@@ -10,7 +10,7 @@
 post_upgrade() {
   update-desktop-database -q
   
-  if [ "`vercmp $2 3.5.0.7-1`" -lt 0 ]; then
+  if [ "`vercmp $2 3.5.0.7-1.1`" -lt 0 ]; then
     # important upgrade notice
     echo "because file location of the default key has been moved"
     echo "you may need to reconfigure your connection and settings"

Added: nxclient.ld.so.conf.d
===================================================================
--- nxclient.ld.so.conf.d	                        (rev 0)
+++ nxclient.ld.so.conf.d	2012-04-16 18:15:05 UTC (rev 156290)
@@ -0,0 +1 @@
+/usr/lib/nx/lib