[X2Go-Commits] [nx-libs] 01/01: Fix Xinerama symlink installation into RPM bin:package libNX_Xinerama. (Fixes: #269).

git-admin at x2go.org git-admin at x2go.org
Mon Oct 13 11:42:04 CEST 2014


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository nx-libs.

commit d86c1be2c0df03e0233eecae0f5441e8da921445
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Mon Oct 13 11:42:00 2014 +0200

    Fix Xinerama symlink installation into RPM bin:package libNX_Xinerama. (Fixes: #269).
---
 debian/changelog |    2 ++
 nx-libs.spec     |   11 +++--------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ae45674..f0cc2d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ nx-libs (2:3.5.0.28-0x2go1) UNRELEASED; urgency=medium
     + SUSE hack for linking to files in libX11-6 and libXext6.
     + Make sure all package directories are owned by one of the
       built bin:packages.
+    + Fix Xinerama symlink installation into RPM bin:package
+      libNX_Xinerama. (Fixes: #269).
 
   [ Nito Martinez ]
   * Add 400_nxcomp-version.full+lite.patch. Allow 4-digit version comparison
diff --git a/nx-libs.spec b/nx-libs.spec
index d8d540a..941e874 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -37,7 +37,6 @@ BuildRequires:  pkgconfig(libpng)
 BuildRequires:  pkgconfig(libxml-2.0)
 BuildRequires:  pkgconfig(x11)
 BuildRequires:  pkgconfig(xext)
-
 %else
 BuildRequires:  libexpat-devel
 BuildRequires:  fontconfig-devel
@@ -637,7 +636,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %post -n libNX_Xext -p /sbin/ldconfig
 %post -n libNX_Xfixes -p /sbin/ldconfig
 %post -n libNX_Xinerama -p /sbin/ldconfig
-
 %post -n libNX_Xpm -p /sbin/ldconfig
 %post -n libNX_Xrandr -p /sbin/ldconfig
 %post -n libNX_Xrender -p /sbin/ldconfig
@@ -645,11 +643,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
 %post -n libXcomp -p /sbin/ldconfig
 %post -n libXcompext -p /sbin/ldconfig
 %post -n libXcompshad -p /sbin/ldconfig
-
-%preun -n libNX_Xinerama
-rm -f %{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
-rm -f %{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
-
 %postun -p /sbin/ldconfig
 %postun -n libNX_X11 -p /sbin/ldconfig
 %postun -n libNX_Xau -p /sbin/ldconfig
@@ -756,7 +749,9 @@ rm -f %{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
 
 %files -n libNX_Xinerama
 %{_libdir}/nx/X11/libNX_Xinerama.so.1*
-%{_libdir}/nx/X11/Xinerama/
+%dir %{_libdir}/nx/X11/Xinerama/
+%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
+%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
 
 %files -n libNX_Xpm-devel
 %{_libdir}/nx/X11/libNX_Xpm.so

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list