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

Tobias Powalowski tpowa at archlinux.org
Fri Jan 22 09:32:28 UTC 2010


    Date: Friday, January 22, 2010 @ 04:32:28
  Author: tpowa
Revision: 64813

upgpkg: nxclient 3.4.0.5-2
    rebuild for libpng bump

Modified:
  nxclient/trunk/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-01-22 08:59:15 UTC (rev 64812)
+++ PKGBUILD	2010-01-22 09:32:28 UTC (rev 64813)
@@ -3,13 +3,14 @@
 #Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org> 
 pkgname=nxclient
 pkgver=3.4.0.5
-pkgrel=1
+pkgrel=2
 pkgdesc="Nomachine's nxclient for nx servers"
 arch=(i686 x86_64)
 url="http://nomachine.com"
 makedepends=('rpmextract')
 license=('custom:nomachine')
-depends=('cups' 'libcups' 'nx-common' 'libxext' 'libxft' 'xorg-xauth')
+depends=('nx-common' 'libxext' 'libxft' 'xorg-xauth')
+optdepends=('cups: for printing support')
 [ "$CARCH" = "x86_64" ] && source=(http://64.34.161.181/download/3.4.0/Linux/$pkgname-3.4.0-5.x86_64.rpm nomachine.key)
 [ "$CARCH" = "x86_64" ] && md5sums=('4227c45b2ecc723ab57621dc714cd82b'
 			            'cb5df74aff5160eab9cd4313019ae228')
@@ -21,13 +22,8 @@
 build() {
   cd ${srcdir}/
   rpmextract.sh *.rpm
-  rm usr/NX/bin/nxssh usr/NX/bin/nxesd
-  rm -r usr/NX/lib
-  rm usr/NX/share/keys/server.id_dsa.key
   sed -i -e 's,/usr/NX,/opt/NX,g' etc/profile.d/nx.sh etc/profile.d/nx.csh
   sed -i -e 's,/usr/NX/,/opt/NX/,g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
-  #sed -i -e 's,/bin/nxclient,/bin/nxclient-nomachine,g' ${srcdir}/usr/NX/share/applnk/network/*.desktop
-
   install -D -m 755 ${srcdir}/etc/profile.d/nx.sh ${pkgdir}/etc/profile.d/nx.sh 
   install -D -m 755 ${srcdir}/etc/profile.d/nx.csh ${pkgdir}/etc/profile.d/nx.csh 
   install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop
@@ -36,10 +32,18 @@
   rm -r ${srcdir}/usr/NX/share/applnk
   cd usr
   mkdir -p ${pkgdir}/opt
-  mv NX ${pkgdir}/opt
+  ### HACK: fix libpng linking until nomachine fixes upstream!
+  mkdir -p ${pkgdir}/usr/NX/lib/
+  cp -a NX/lib/libpng* ${pkgdir}/usr/NX/lib/
+  rm -r NX/lib
+  # provided by nx-common
+  rm NX/bin/nxssh NX/bin/nxesd
+  # provide default key file later
+  rm NX/share/keys/server.id_dsa.key
+  # move files to /opt
+  cp -a NX ${pkgdir}/opt
   # add default key file
   install -D -m 644 ${srcdir}/nomachine.key ${pkgdir}/opt/NX/share/keys/server.id_dsa.key
-  #mv ${pkgdir}/opt/NX/bin/nxclient ${pkgdir}/opt/NX/bin/nxclient-nomachine
   # add license file
   mkdir -p ${pkgdir}/usr/share/licenses/nxclient
   mv ${pkgdir}/opt/NX/share/documents/client/license-info ${pkgdir}/usr/share/licenses/nxclient/LICENSE




More information about the arch-commits mailing list