From 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Thu, 30 Jun 2016 23:50:12 +0200
Subject: Rework nxagent and nxproxy wrapper scripts.

  o Install nxagent/nxproxy executables into multi-arch path.
  o Fake libNX_X11.so* as $LIBDIR/nx-X11/libX11.so*.
  o Allow injecting different $NXAPP containing the executable name.

  o For e.g. x2goagent this requires the following changes:

    - Move x2goagent symlink from /usr/lib/x2go/bin/x2goagent to
      $LIBDIR/nx/bin/x2goagent
    - Replace /usr/bin/x2goagent by a two-liner...

    ```
    #!/bin/sh

    export NXAPP=x2goagent
    nxagent
    ```
---
 nx-libs.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'nx-libs.spec')

diff --git a/nx-libs.spec b/nx-libs.spec
index 5adb42ca2..418a83bdd 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -329,8 +329,7 @@ sed -i -e 's#-O3#%{optflags}#' nx-X11/config/cf/host.def
 # Use multilib dirs
 # We're installing binaries into %%{_libdir}/nx/bin rather than %%{_libexedir}/nx
 # because upstream expects libraries and binaries in the same directory
-sed -i -e 's,/lib/nx,/%{_lib}/nx,' Makefile nx-X11/config/cf/X11.tmpl
-sed -i -e 's,/usr/lib/,/usr/%{_lib}/,' bin/*
+sed -i -e 's,/lib/nx,/%{_lib}/nx,' nx-X11/config/cf/X11.tmpl
 # Fix FSF address
 find -name LICENSE | xargs sed -i \
   -e 's/59 Temple Place/51 Franklin Street/' -e 's/Suite 330/Fifth Floor/' \
-- 
cgit v1.2.3