aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/lib/xkbfile
diff options
context:
space:
mode:
authorJan Engelhardt <jengelh@medozas.de>2015-02-13 13:27:42 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2015-02-13 13:27:42 +0100
commitc4a8556c45786c83b04b2e958234cb4c724e1910 (patch)
tree753b7f4d4ff8eacc0bbf79be7251facfa4aea0a1 /nx-X11/lib/xkbfile
parentd4d3fe0e6e77a58e68defc5895a589a681d7d092 (diff)
downloadnx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.gz
nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.tar.bz2
nx-libs-c4a8556c45786c83b04b2e958234cb4c724e1910.zip
Unique Library Names Patch (600_nx-X11+nxcompext+nxcompshad_unique-libnames.full.patch).
We really want to make use of rpm's automatic dependency finding. Binaries are scanned for DT_NEEDED entries, the latter of which are then used for populating the "Requires"-type deps. The "nxagent" binary for example would require libX11.so.6. That incurs problems: 1. A package manager told to install nxagent could select xorg-x11 rather than nx-libs, even though nxagent depends on the NX version. 2. A package manager told to install $some_program could select nx-libs rather than xorg-x11 (since both provide libX11.so.6), but, since the NX library is in an obscure directory, running $some_program would fail as libX11.so.6 is not found. To solve this, give the NX libraries unique names different from the Xorg ones.
Diffstat (limited to 'nx-X11/lib/xkbfile')
-rw-r--r--nx-X11/lib/xkbfile/Imakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/nx-X11/lib/xkbfile/Imakefile b/nx-X11/lib/xkbfile/Imakefile
index 7b751c903..d7693819e 100644
--- a/nx-X11/lib/xkbfile/Imakefile
+++ b/nx-X11/lib/xkbfile/Imakefile
@@ -11,7 +11,7 @@ XCOMM $XFree86: xc/lib/xkbfile/Imakefile,v 3.5 2003/10/15 21:23:38 herrb Exp $
#define DoDebugLib DebugLibxkbfile
#define DoProfileLib ProfileLibxkbfile
#define HasSharedData NO
-#define LibName xkbfile
+#define LibName NX_xkbfile
#define SoRev SOXKBFILEREV
#define IncSubdir X11
#define IncSubSubdir extensions