From 49fc383a4107062a843bc0c3a8fd9cae7e20e032 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 5 Apr 2015 18:07:53 +0200 Subject: library clean-up: Don't build libNX_Xdmcp anymore. Use system's libXdmcp shared library. --- nx-libs.spec | 59 +++-------------------------------------------------------- 1 file changed, 3 insertions(+), 56 deletions(-) (limited to 'nx-libs.spec') diff --git a/nx-libs.spec b/nx-libs.spec index f4525bee1..6774a7ed6 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -33,6 +33,7 @@ BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xpm) BuildRequires: pkgconfig(xfont) +BuildRequires: pkgconfig(xdmcp) %else BuildRequires: libexpat-devel BuildRequires: libpng-devel @@ -41,6 +42,7 @@ BuildRequires: xorg-x11-libX11-devel BuildRequires: xorg-x11-libXext-devel BuildRequires: xorg-x11-libXpm-devel BuildRequires: xorg-x11-libXfont-devel +BuildRequires: xorg-x11-libXdmcp-devel %endif BuildRequires: xorg-x11-util-devel %endif @@ -50,6 +52,7 @@ BuildRequires: expat-devel BuildRequires: libpng-devel BuildRequires: libxml2-devel BuildRequires: libXfont-devel +BuildRequires: libXdmcp-devel %endif # For imake @@ -214,50 +217,6 @@ The X Damage Extension allows applications to track modified regions of drawables. -%package -n libNX_Xdmcp-devel -Group: Development/Libraries -Summary: Development files for the NXDM Control Protocol library -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: libNX_Xdmcp6%{?_isa} = %{version}-%{release} -Requires: nx-proto-devel%{?_isa} = %{version}-%{release} - -%description -n libNX_Xdmcp-devel -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 X Display Manager Control Protocol (XDMCP) provides a uniform -mechanism for an autonomous display to request login service from a -remote host. By autonomous, we mean the display consists of hardware -and processes that are independent of any particular host where login -service is desired. An X terminal (screen, keyboard, mouse, -processor, network interface) is a prime example of an autonomous -display. - -This package contains all necessary include files and libraries -needed to develop applications that require these. - - -%package -n libNX_Xdmcp6 -Group: System Environment/Libraries -Summary: NX Display Manager Control Protocol library -Requires: %{name}%{?_isa} >= 3.5.0.29 -Obsoletes: libNX_Xdmcp - -%description -n libNX_Xdmcp6 -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 X Display Manager Control Protocol (XDMCP) provides a uniform -mechanism for an autonomous display to request login service from a -remote host. By autonomous, we mean the display consists of hardware -and processes that are independent of any particular host where login -service is desired. An X terminal (screen, keyboard, mouse, -processor, network interface) is a prime example of an autonomous -display. - - %package -n libNX_Xext-devel Group: Development/Libraries Summary: Development files for the NX Common Extensions library @@ -518,7 +477,6 @@ Group: Development/Libraries Summary: Include files and libraries for NX development Requires: libNX_X11-devel%{?_isa} = %{version}-%{release} Requires: libNX_Xau-devel%{?_isa} = %{version}-%{release} -Requires: libNX_Xdmcp-devel%{?_isa} = %{version}-%{release} Requires: libNX_Xext-devel%{?_isa} = %{version}-%{release} Requires: libNX_Xfixes-devel%{?_isa} = %{version}-%{release} Requires: libNX_Xrender-devel%{?_isa} = %{version}-%{release} @@ -699,7 +657,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %post -n libNX_Xau6 -p /sbin/ldconfig %post -n libNX_Xcomposite1 -p /sbin/ldconfig %post -n libNX_Xdamage1 -p /sbin/ldconfig -%post -n libNX_Xdmcp6 -p /sbin/ldconfig %post -n libNX_Xext6 -p /sbin/ldconfig %post -n libNX_Xfixes3 -p /sbin/ldconfig %post -n libNX_Xinerama1 -p /sbin/ldconfig @@ -714,7 +671,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %postun -n libNX_Xau6 -p /sbin/ldconfig %postun -n libNX_Xcomposite1 -p /sbin/ldconfig %postun -n libNX_Xdamage1 -p /sbin/ldconfig -%postun -n libNX_Xdmcp6 -p /sbin/ldconfig %postun -n libNX_Xext6 -p /sbin/ldconfig %postun -n libNX_Xfixes3 -p /sbin/ldconfig %postun -n libNX_Xinerama1 -p /sbin/ldconfig @@ -776,15 +732,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama %defattr(-,root,root) %{_libdir}/libNX_Xdamage.so.1* -%files -n libNX_Xdmcp-devel -%defattr(-,root,root) -%{_libdir}/libNX_Xdmcp.so -%{_includedir}/nx/X11/Xdmcp.h - -%files -n libNX_Xdmcp6 -%defattr(-,root,root) -%{_libdir}/libNX_Xdmcp.so.6* - %files -n libNX_Xext-devel %defattr(-,root,root) %{_libdir}/libNX_Xext.so -- cgit v1.2.3