library clean-up: Don't build libNX_Xtst anymore. Use system's libXtst shared library. (Fixes ArcticaProject/nx-libs#32).

1 files changed, 5 insertions, 33 deletions

diff --git a/nx-libs.spec b/nx-libs.spec
index abe41d160..22094c2a5 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -38,6 +38,7 @@ BuildRequires:  pkgconfig(xdamage)
 BuildRequires:  pkgconfig(xcomposite)
 BuildRequires:  pkgconfig(xrandr)
 BuildRequires:  pkgconfig(xfixes)
+BuildRequires:  pkgconfig(xtst)
 %else
 BuildRequires:  libexpat-devel
 BuildRequires:  libpng-devel
@@ -51,6 +52,7 @@ BuildRequires:  xorg-x11-libXdamage-devel
 BuildRequires:  xorg-x11-libXcomposite-devel
 BuildRequires:  xorg-x11-libXrandr-devel
 BuildRequires:  xorg-x11-libXfixes-devel
+BuildRequires:  xorg-x11-libXtst-devel
 %endif
 BuildRequires:  xorg-x11-util-devel
 %endif
@@ -64,6 +66,7 @@ BuildRequires:  libXdmcp-devel
 BuildRequires:  libXcomposite-devel
 BuildRequires:  libXrandr-devel
 BuildRequires:  libXfixes-devel
+BuildRequires:  libXtst-devel
 %endif
 
 # For imake
@@ -291,26 +294,6 @@ The Xrender library is designed as a lightweight library interface to
 the Render extension.
 
 
-%package -n libNX_Xtst6
-Group:          System Environment/Libraries
-Summary:        Xlib-based client API for the XTEST and RECORD extensions on NX
-Requires:       %{name}%{?_isa} >= 3.5.0.29
-Obsoletes:      libNX_Xtst
-
-%description -n libNX_Xtst6
-NX is a software suite which implements very efficient compression of
-the X11 protocol. This increases performance when using X
-applications over a network, especially a slow one.
-
-The XTEST extension is a minimal set of client and server extensions
-required to completely test the X11 server with no user intervention.
-This extension is not intended to support general journaling and
-playback of user actions.
-
-The RECORD extension supports the recording and reporting of all core
-X protocol and arbitrary X extension protocol.
-
-
 %package -n libXcomp-devel
 Group:          Development/Libraries
 Summary:        Development files for the NX differential compression library
@@ -443,10 +426,6 @@ Provides:       nx%{?_isa} = %{version}-%{release}
 Requires:       xorg-x11-fonts-core
 %endif
 
-# Should be a weak dependency, because this package
-# works without the dependency.
-Requires:       xkeyboard-config
-
 %description -n nxagent
 NX is a software suite which implements very efficient compression of
 the X11 protocol. This increases performance when using X
@@ -589,7 +568,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %post -n libNX_Xext6 -p /sbin/ldconfig
 %post -n libNX_Xinerama1 -p /sbin/ldconfig
 %post -n libNX_Xrender1 -p /sbin/ldconfig
-%post -n libNX_Xtst6 -p /sbin/ldconfig
 %post -n libXcomp3 -p /sbin/ldconfig
 %post -n libXcompext3 -p /sbin/ldconfig
 %post -n libXcompshad3 -p /sbin/ldconfig
@@ -599,7 +577,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %postun -n libNX_Xext6 -p /sbin/ldconfig
 %postun -n libNX_Xinerama1 -p /sbin/ldconfig
 %postun -n libNX_Xrender1 -p /sbin/ldconfig
-%postun -n libNX_Xtst6 -p /sbin/ldconfig
 %postun -n libXcomp3 -p /sbin/ldconfig
 %postun -n libXcompext3 -p /sbin/ldconfig
 %postun -n libXcompshad3 -p /sbin/ldconfig
@@ -672,7 +649,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %{_includedir}/nx-X11/extensions/shape.h
 %{_includedir}/nx-X11/extensions/sync.h
 %{_includedir}/nx-X11/extensions/xtestext1.h
-%{_includedir}/nx-X11/extensions/xteststr.h
 
 %files -n libNX_Xext6
 %defattr(-,root,root)
@@ -691,10 +667,6 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %defattr(-,root,root)
 %{_libdir}/libNX_Xrender.so.1*
 
-%files -n libNX_Xtst6
-%defattr(-,root,root)
-%{_libdir}/libNX_Xtst.so.6*
-
 %files -n libXcomp-devel
 %defattr(-,root,root)
 %_libdir/libXcomp.so
@@ -751,10 +723,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %files devel
 %defattr(-,root,root)
 %{_libdir}/libNX_Xinerama.so
-%{_libdir}/libNX_Xtst.so
 %{_includedir}/nx-X11/X10.h
 %dir %{_includedir}/nx-X11/extensions
-%{_includedir}/nx-X11/extensions/XTest.h
 %{_includedir}/nx-X11/extensions/Xevie.h
 %{_includedir}/nx-X11/extensions/Xinerama.h
 %{_includedir}/nx-X11/extensions/lbxbuf.h
@@ -825,6 +795,8 @@ ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/X
 %{_includedir}/nx-X11/extensions/xf86vmstr.h
 %{_includedir}/nx-X11/extensions/xfixesproto.h
 %{_includedir}/nx-X11/extensions/xfixeswire.h
+%{_includedir}/nx-X11/extensions/xtestconst.h
+%{_includedir}/nx-X11/extensions/xteststr.h
 %{_includedir}/nx-X11/extensions/xtrapbits.h
 %{_includedir}/nx-X11/extensions/xtrapddmi.h
 %{_includedir}/nx-X11/extensions/xtrapdi.h