diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-06-30 23:50:12 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-07-01 16:07:50 +0200 |
| commit | 5934d03efdcf32e8ecdf61cc29a80b2088e6de9c (patch) | |
| tree | e1b687d9c6a658c81801c8fc9dba9a063f22b3da /nx-libs.spec | |
| parent | da7261cfe0244fcf329e0597f9d122293fd4f9eb (diff) | |
| download | nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.tar.gz nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.tar.bz2 nx-libs-5934d03efdcf32e8ecdf61cc29a80b2088e6de9c.zip | |
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
```
Diffstat (limited to 'nx-libs.spec')
| -rw-r--r-- | nx-libs.spec | 3 |
1 files changed, 1 insertions, 2 deletions
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/' \ |