[X2Go-Commits] [nx-libs] 01/01: nx-libs.spec: Sync nx-libs.spec in Fedora with upstream's nx-libs.spec file. (Fixes: #393).

git-admin at x2go.org git-admin at x2go.org
Tue Jan 28 19:48:36 CET 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 faa289a82954860c9dfb44dc7eb4d39ea6d99f25
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Jan 28 19:48:21 2014 +0100

    nx-libs.spec: Sync nx-libs.spec in Fedora with upstream's nx-libs.spec file. (Fixes: #393).
---
 debian/changelog |    3 +++
 nx-libs.spec     |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b1a782..d52b685 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 at das-netzwerkteam.de>  Sat, 04 Jan 2014 22:02:16 +0100
 
diff --git a/nx-libs.spec b/nx-libs.spec
index 860a4a7..263203f 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

--
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