aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMihai Moldovan <ionic@ionic.de>2015-04-30 15:14:24 +0200
committerMihai Moldovan <ionic@ionic.de>2015-04-30 15:18:30 +0200
commita17bd57efab94bd75aab0596b6f3aa7da677a8ec (patch)
tree2d70a3a42de9044225ee8ba76360b3d524b837bb
parent8726e7d0b5765c39f8470715442ed959991875f9 (diff)
downloadnx-libs-a17bd57efab94bd75aab0596b6f3aa7da677a8ec.tar.gz
nx-libs-a17bd57efab94bd75aab0596b6f3aa7da677a8ec.tar.bz2
nx-libs-a17bd57efab94bd75aab0596b6f3aa7da677a8ec.zip
nx-libs.spec: actually create libXinerama.so.1 symlink during build phase.
Backported from Arctica GH 3.6.x branch.
-rw-r--r--debian/changelog2
-rw-r--r--nx-libs.spec1
2 files changed, 3 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8fa0ee679..fbc633d08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -140,6 +140,8 @@ nx-libs (2:3.5.0.32-0x2go1) UNRELEASED; urgency=low
* debian/libnx-xinerama1.*: move Xinerama dir back to nx-x11-common. Only
delete known files. Fixes RPM build failures.
Backported from Arctica GH 3.6.x branch.
+ * nx-libs.spec: actually create libXinerama.so.1 symlink during build phase.
+ Backported from Arctica GH 3.6.x branch.
[ Bernard Cafarelli ]
* nx-X11: link to libdl to fix undefined references to 'dlopen' and 'dlsym'.
diff --git a/nx-libs.spec b/nx-libs.spec
index 2bb56501f..a29fa261f 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -769,6 +769,7 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
# Needed for Xinerama support
ln -s -f ../../../../%{_lib}/libX11.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
+ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/Xinerama/libXinerama.so.1
%if 0%{?fdupes:1}
%fdupes %buildroot/%_prefix