[arch-commits] Commit in nxclient/repos (8 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Sat Apr 28 09:58:44 UTC 2012
Date: Saturday, April 28, 2012 @ 05:58:43
Author: andyrtr
Revision: 157438
db-move: moved nxclient from [testing] to [extra] (i686)
Added:
nxclient/repos/extra-i686/PKGBUILD
(from rev 157431, nxclient/repos/testing-i686/PKGBUILD)
nxclient/repos/extra-i686/nomachine.key
(from rev 157431, nxclient/repos/testing-i686/nomachine.key)
nxclient/repos/extra-i686/nxclient.install
(from rev 157431, nxclient/repos/testing-i686/nxclient.install)
nxclient/repos/extra-i686/nxclient.ld.so.conf.d
(from rev 157431, nxclient/repos/testing-i686/nxclient.ld.so.conf.d)
Deleted:
nxclient/repos/extra-i686/PKGBUILD
nxclient/repos/extra-i686/nomachine.key
nxclient/repos/extra-i686/nxclient.install
nxclient/repos/testing-i686/
-----------------------+
PKGBUILD | 131 +++++++++++++++++++++++++-----------------------
nomachine.key | 24 ++++----
nxclient.install | 30 ++++++++--
nxclient.ld.so.conf.d | 1
4 files changed, 105 insertions(+), 81 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-04-28 09:58:42 UTC (rev 157437)
+++ extra-i686/PKGBUILD 2012-04-28 09:58:43 UTC (rev 157438)
@@ -1,61 +0,0 @@
-# $Id$
-# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
-#Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
-
-pkgname=nxclient
-pkgver=3.5.0.7
-pkgrel=1
-pkgdesc="Nomachine's closed source client for NX servers"
-arch=(i686 x86_64)
-url="http://nomachine.com"
-makedepends=('rpmextract')
-license=('custom:nomachine')
-depends=('nx-common>=3.5.0' 'libxext' 'libxft' 'xorg-xauth')
-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')
-install=nxclient.install
-
-build() {
- cd ${srcdir}/
- rpmextract.sh *.rpm
- 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
-}
-
-package() {
- mkdir -p ${pkgdir}/opt
- cd ${srcdir}/usr
- 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
- install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop
- install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop
- rm -r ${srcdir}/usr/NX/share/applnk
-
- # remove libs that come in system and are provided by nx-common
- rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*}
- ### HACK: fix libpng linking until nomachine fixes upstream! - shouldn't be needed, why not /opt/NX/lib ?
- 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
- rm NX/bin/nxesd # esd support has been fully dropped
-
- # 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
-
- # 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
-}
Copied: nxclient/repos/extra-i686/PKGBUILD (from rev 157431, nxclient/repos/testing-i686/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-04-28 09:58:43 UTC (rev 157438)
@@ -0,0 +1,70 @@
+# $Id$
+# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
+#Contributed: eliott <eliott at solarblue.net>, Andre Naumann <anaumann at SPARCed.org>
+
+pkgname=nxclient
+pkgver=3.5.0.7
+pkgrel=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-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 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
+}
+
+package() {
+ # profile files
+ 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
+ # menu entries
+ install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-wizard.desktop ${pkgdir}/usr/share/applications/nxclient-wizard.desktop
+ install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient.desktop ${pkgdir}/usr/share/applications/nxclient.desktop
+ install -D -m 644 ${srcdir}/usr/NX/share/applnk/network/nxclient-admin.desktop ${pkgdir}/usr/share/applications/nxclient-admin.desktop
+ rm -r ${srcdir}/usr/NX/share/applnk
+
+ # remove libs that come in system and are provided by libxcomp/nx-x11
+ rm ${srcdir}/usr/NX/lib/{libXcomp.*,libXcompsh.*,libcrypto.*,libjpeg.*,libz.*}
+
+ # provided by nx-common
+ rm ${srcdir}/usr/NX/bin/nxssh
+ rm ${srcdir}/usr/NX/bin/nxesd # esd support has been fully dropped
+
+ # provide default key file later
+ rm ${srcdir}/usr/NX/share/keys/server.id_dsa.key
+
+ # move files
+ 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} .
+
+ # 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
+
+ # 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
+
+ # some cleanup
+ rm -rf ${pkgdir}/usr/lib/nx/share/{documents,cups}
+
+ # fix insecure rpath
+ chrpath -d "$pkgdir/usr/lib/nx/bin/nxclient"
+}
Deleted: extra-i686/nomachine.key
===================================================================
--- extra-i686/nomachine.key 2012-04-28 09:58:42 UTC (rev 157437)
+++ extra-i686/nomachine.key 2012-04-28 09:58:43 UTC (rev 157438)
@@ -1,12 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9
-C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF
-aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi
-xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z
-5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG
-fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY
-+Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa
-QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3
-mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf
-8xAPsSKs6yZ6j1FNklfu
------END DSA PRIVATE KEY-----
Copied: nxclient/repos/extra-i686/nomachine.key (from rev 157431, nxclient/repos/testing-i686/nomachine.key)
===================================================================
--- extra-i686/nomachine.key (rev 0)
+++ extra-i686/nomachine.key 2012-04-28 09:58:43 UTC (rev 157438)
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBuwIBAAKBgQCXv9AzQXjxvXWC1qu3CdEqskX9YomTfyG865gb4D02ZwWuRU/9
+C3I9/bEWLdaWgJYXIcFJsMCIkmWjjeSZyTmeoypI1iLifTHUxn3b7WNWi8AzKcVF
+aBsBGiljsop9NiD1mEpA0G+nHHrhvTXz7pUvYrsrXcdMyM6rxqn77nbbnwIVALCi
+xFdHZADw5KAVZI7r6QatEkqLAoGBAI4L1TQGFkq5xQ/nIIciW8setAAIyrcWdK/z
+5/ZPeELdq70KDJxoLf81NL/8uIc4PoNyTRJjtT3R4f8Az1TsZWeh2+ReCEJxDWgG
+fbk2YhRqoQTtXPFsI4qvzBWct42WonWqyyb1bPBHk+JmXFscJu5yFQ+JUVNsENpY
++Gkz3HqTAoGANlgcCuA4wrC+3Cic9CFkqiwO/Rn1vk8dvGuEQqFJ6f6LVfPfRTfa
+QU7TGVLk2CzY4dasrwxJ1f6FsT8DHTNGnxELPKRuLstGrFY/PR7KeafeFZDf+fJ3
+mbX5nxrld3wi5titTnX+8s4IKv29HJguPvOK/SI7cjzA+SqNfD7qEo8CFDIm1xRf
+8xAPsSKs6yZ6j1FNklfu
+-----END DSA PRIVATE KEY-----
Deleted: extra-i686/nxclient.install
===================================================================
--- extra-i686/nxclient.install 2012-04-28 09:58:42 UTC (rev 157437)
+++ extra-i686/nxclient.install 2012-04-28 09:58:43 UTC (rev 157438)
@@ -1,8 +0,0 @@
-# arg 1: the new package version
-post_install() {
-/bin/cat <<THEEND
-ATTENTION NXCLIENT:
-For correct setup please take a look at the wiki:
-http://wiki.archlinux.org/index.php/FreeNX
-THEEND
-}
Copied: nxclient/repos/extra-i686/nxclient.install (from rev 157431, nxclient/repos/testing-i686/nxclient.install)
===================================================================
--- extra-i686/nxclient.install (rev 0)
+++ extra-i686/nxclient.install 2012-04-28 09:58:43 UTC (rev 157438)
@@ -0,0 +1,22 @@
+post_install() {
+ update-desktop-database -q
+
+ echo "For correct setup please take a look at the wiki:"
+ echo "http://wiki.archlinux.org/index.php/FreeNX"
+
+
+}
+
+post_upgrade() {
+ update-desktop-database -q
+
+ 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"
+ fi
+}
+
+post_remove() {
+ update-desktop-database -q
+}
Copied: nxclient/repos/extra-i686/nxclient.ld.so.conf.d (from rev 157431, nxclient/repos/testing-i686/nxclient.ld.so.conf.d)
===================================================================
--- extra-i686/nxclient.ld.so.conf.d (rev 0)
+++ extra-i686/nxclient.ld.so.conf.d 2012-04-28 09:58:43 UTC (rev 157438)
@@ -0,0 +1 @@
+/usr/lib/nx/lib
More information about the arch-commits
mailing list