aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/Makefile.nx-libs9
-rw-r--r--debian/changelog1
-rw-r--r--nx-libs.spec11
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/Makefile.nx-libs b/debian/Makefile.nx-libs
index ac814dd2f..1aecee9d3 100644
--- a/debian/Makefile.nx-libs
+++ b/debian/Makefile.nx-libs
@@ -3,6 +3,7 @@
INSTALL_DIR=install -d -m 755
INSTALL_FILE=install -m 644
INSTALL_PROGRAM=install -m 755
+INSTALL_SYMLINK=ln -s -f
COPY_SYMLINK=cp -a
RM_FILE=rm -f
RM_DIR=rmdir -p --ignore-fail-on-non-empty
@@ -114,6 +115,14 @@ install-full:
"$$(string_rep "$$dirname" nx-X11/.build-exports/include "$(DESTDIR)$(PREFIX)/include/nx")"/ || true; \
done; \
+ # Provide means for Xinerama support in NX/X2Go sessions. This
+ # This also requires two post-install symlinks:
+ # (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
$(INSTALL_FILE) nx-X11/.build-exports/include/X11/bitmaps/* \
$(DESTDIR)$(PREFIX)/include/nx/X11/bitmaps/
diff --git a/debian/changelog b/debian/changelog
index 4486f7f48..72cbc7b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,7 @@ nx-libs (2:3.5.0.22-0x2go1) UNRELEASED; urgency=low
+ Use local tarball, don't expect ,,-full'' in tarball name.
+ The RPM macro for the linker flags does not exist on EPEL. Thus, hardcode
__global_ldflags macro for EPEL builds.
+ + Enable Xinerama support for RPM packages. (Fixes: #370).
[ Clemens Lang ]
* Add patch 605_nxcomp_Types.h-dont-use-STL-internals-on-libc++.full.patch. Fix
diff --git a/nx-libs.spec b/nx-libs.spec
index a851141a5..84e53c1d6 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -235,6 +235,8 @@ various limitations in the core protocol.
Group: System Environment/Libraries
Summary: Xinerama extension to the NX Protocol
Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libX11
+Requires: libXext
%description -n libNX_Xinerama
Xinerama is an extension to the X Window System which enables
@@ -534,7 +536,6 @@ chmod a+x my_configure;
export SHLIBGLOBALSFLAGS="%{__global_ldflags}"
make %{?_smp_mflags} CONFIGURE="$PWD/my_configure" USRLIBDIR=%{_libdir}/nx SHLIBDIR=%{_libdir}/nx
-
%install
make install \
DESTDIR=%{buildroot} \
@@ -577,6 +578,9 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
%post -n libNX_Xext -p /sbin/ldconfig
%post -n libNX_Xfixes -p /sbin/ldconfig
%post -n libNX_Xinerama -p /sbin/ldconfig
+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
+
%post -n libNX_Xpm -p /sbin/ldconfig
%post -n libNX_Xrandr -p /sbin/ldconfig
%post -n libNX_Xrender -p /sbin/ldconfig
@@ -585,6 +589,10 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
%post -n libXcompext -p /sbin/ldconfig
%post -n libXcompshad -p /sbin/ldconfig
+%preun -n libNX_Xinerama
+rm -f %{_libdir}/X11/Xinerama/libNX_X11.so.6
+rm -f %{_libdir}/X11/Xinerama/libNX_Xext.so.6
+
%postun -p /sbin/ldconfig
%postun -n libNX_X11 -p /sbin/ldconfig
%postun -n libNX_Xau -p /sbin/ldconfig
@@ -689,6 +697,7 @@ rm -r %{buildroot}%{_includedir}/nx/X11/Xtrans
%files -n libNX_Xinerama
%{_libdir}/nx/X11/libNX_Xinerama.so.1*
+%{_libdir}/nx/X11/Xinerama/
%files -n libNX_Xpm-devel
%{_libdir}/nx/X11/libNX_Xpm.so