aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog3
-rw-r--r--nx-libs.spec12
2 files changed, 9 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index 8b1a78233..d52b685bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ nx-libs (2:3.5.0.23-0x2go1) UNRELEASED; urgency=low
* Add patch: 055_nx-X11_imake-Werror-format-security.full.patch. Fix FTBFS
of imake on current Fedora rawhide (21) which uses the compiler option
-Werror=format-security for all builds. (Fixes: #412).
+ * nx-libs.spec:
+ - Sync nx-libs.spec in Fedora with upstream's nx-libs.spec file. (Fixes:
+ #393).
-- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Sat, 04 Jan 2014 22:02:16 +0100
diff --git a/nx-libs.spec b/nx-libs.spec
index 860a4a787..263203fa0 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -235,8 +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
+Requires: libX11%{?_isa}
+Requires: libXext%{?_isa}
%description -n libNX_Xinerama
Xinerama is an extension to the X Window System which enables
@@ -568,6 +568,9 @@ rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XK*.h
rm -r %{buildroot}%{_includedir}/nx/X11/extensions/*Xv*.h
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
%post -p /sbin/ldconfig
%post -n libNX_X11 -p /sbin/ldconfig
@@ -577,10 +580,7 @@ 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
-ln -s -f %{_libdir}/libX11.so.6 %{_libdir}/nx/X11/Xinerama/libNX_X11.so.6
-ln -s -f %{_libdir}/libXext.so.6 %{_libdir}/nx/X11/Xinerama/libNX_Xext.so.6
-/sbin/ldconfig
+%post -n libNX_Xinerama -p /sbin/ldconfig
%post -n libNX_Xpm -p /sbin/ldconfig
%post -n libNX_Xrandr -p /sbin/ldconfig