aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-17 17:16:47 +0100
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2013-12-17 17:16:47 +0100
commitedbd95b9056ec39d827dcfbb6291754cae990d40 (patch)
tree1d10c271bc823d96e30397065c9c7b51e379162c
parent36cdfdcb52f683aab89159a261689d3e9fbcb171 (diff)
downloadnx-libs-edbd95b9056ec39d827dcfbb6291754cae990d40.tar.gz
nx-libs-edbd95b9056ec39d827dcfbb6291754cae990d40.tar.bz2
nx-libs-edbd95b9056ec39d827dcfbb6291754cae990d40.zip
attempt to correct symlink creation for Xinerama support
-rw-r--r--debian/Makefile.nx-libs1
-rw-r--r--nx-libs.spec3
2 files changed, 2 insertions, 2 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 1aecee9d3..1c0909f2b 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -120,7 +120,6 @@ install-full:
# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_X11.so.6 -> /usr/<libdir>/libX11.so.6
# (DESTDIR)$(NXLIBDIR)/X11/Xinerama/libNX_Xext.so.6 -> /usr/<libdir>/libXext.so.6
$(INSTALL_DIR) $(DESTDIR)$(NXLIBDIR)/X11/Xinerama
- $(INSTALL_SYMLINK) ../libNX_Xinerama.so $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so
$(INSTALL_SYMLINK) ../libNX_Xinerama.so.1 $(DESTDIR)$(NXLIBDIR)/X11/Xinerama/libXinerama.so.1
$(INSTALL_DIR) $(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps
diff --git a/nx-libs.spec b/nx-libs.spec
index 84e53c1d6..e9b6b81dd 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -577,9 +577,10 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
%post -n libNX_Xdmcp -p /sbin/ldconfig
%post -n libNX_Xext -p /sbin/ldconfig
%post -n libNX_Xfixes -p /sbin/ldconfig
-%post -n libNX_Xinerama -p /sbin/ldconfig
+%post -n libNX_Xinerama
ln -s -f %{_libdir}/libX11.so.6 %{_libdir}/X11/Xinerama/libNX_X11.so.6
ln -s -f %{_libdir}/libXext.so.6 %{_libdir}/X11/Xinerama/libNX_Xext.so.6
+/sbin/ldconfig
%post -n libNX_Xpm -p /sbin/ldconfig
%post -n libNX_Xrandr -p /sbin/ldconfig