[X2Go-Commits] nx-libs.git - master (branch) updated: redist-server/3.5.0.21-27-gedbd95b

[X2Go dev team]

The branch, master has been updated
       via  edbd95b9056ec39d827dcfbb6291754cae990d40 (commit)
      from  36cdfdcb52f683aab89159a261689d3e9fbcb171 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit edbd95b9056ec39d827dcfbb6291754cae990d40
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Dec 17 17:16:47 2013 +0100

    attempt to correct symlink creation for Xinerama support

-----------------------------------------------------------------------

Summary of changes:
 debian/Makefile.nx-libs |    1 -
 nx-libs.spec            |    3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

The diff of changes is:
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index 1aecee9..1c0909f 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 84e53c1..e9b6b81 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


hooks/post-receive
-- 
nx-libs.git (NX (redistributed))

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "nx-libs.git" (NX (redistributed)).