aboutsummaryrefslogtreecommitdiff
path: root/nx-libs.spec
diff options
context:
space:
mode:
Diffstat (limited to 'nx-libs.spec')
-rw-r--r--nx-libs.spec155
1 files changed, 10 insertions, 145 deletions
diff --git a/nx-libs.spec b/nx-libs.spec
index 7c594cc20..9e8a16e4e 100644
--- a/nx-libs.spec
+++ b/nx-libs.spec
@@ -27,35 +27,35 @@ BuildRequires: gpg-offline
BuildRequires: fdupes
%if 0%{?suse_version} >= 1130
BuildRequires: pkgconfig(expat)
-BuildRequires: pkgconfig(fontconfig)
-BuildRequires: pkgconfig(fontenc)
-BuildRequires: pkgconfig(freetype2)
BuildRequires: pkgconfig(libpng)
BuildRequires: pkgconfig(libxml-2.0)
BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext)
BuildRequires: pkgconfig(xpm)
+BuildRequires: pkgconfig(xfont)
+BuildRequires: pkgconfig(xdmcp)
+BuildRequires: pkgconfig(xdamage)
%else
BuildRequires: libexpat-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freetype2-devel
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
BuildRequires: xorg-x11-libX11-devel
BuildRequires: xorg-x11-libXext-devel
-BuildRequires: xorg-x11-libfontenc-devel
BuildRequires: xorg-x11-libXpm-devel
+BuildRequires: xorg-x11-libXfont-devel
+BuildRequires: xorg-x11-libXdmcp-devel
+BuildRequires: xorg-x11-libXdamage-devel
%endif
BuildRequires: xorg-x11-util-devel
%endif
%if 0%{?fedora} || 0%{?rhel}
BuildRequires: expat-devel
-BuildRequires: fontconfig-devel
-BuildRequires: freetype-devel
-BuildRequires: libfontenc-devel
BuildRequires: libpng-devel
BuildRequires: libxml2-devel
+BuildRequires: libXfont-devel
+BuildRequires: libXdmcp-devel
+BuildRequires: libXdamage-devel
%endif
# For imake
@@ -205,65 +205,6 @@ off-screen buffer can be automatically merged into the parent window
or merged by external programs, called compositing managers.
-%package -n libNX_Xdamage1
-Group: System Environment/Libraries
-Summary: NX Damage Extension library
-Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libNX_Xdamage
-
-%description -n libNX_Xdamage1
-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 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
@@ -360,33 +301,6 @@ multi-headed X applications and window managers to use two or more
physical displays as one large virtual display.
-%package -n libNX_Xpm-devel
-Group: Development/Libraries
-Summary: Development files for the NX Pixmap image file format library (dummy package)
-Requires: libNX_Xpm4%{?_isa} = %{version}-%{release}
-
-%description -n libNX_Xpm-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.
-
-This package obsoletes libNX_Xpm-devel in NX and can be safely removed.
-
-
-%package -n libNX_Xpm4
-Group: System Environment/Libraries
-Summary: NX Pixmap image file format library (dummy package)
-Requires: %{name}%{?_isa} >= 3.5.0.29
-Obsoletes: libNX_Xpm
-
-%description -n libNX_Xpm4
-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.
-
-This package obsoletes libNX_Xpm4 in NX and can be safely removed.
-
-
%package -n libNX_Xrandr2
Group: System Environment/Libraries
Summary: NX Resize, Rotate and Reflection extension library
@@ -551,7 +465,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}
@@ -676,12 +589,9 @@ find -name LICENSE | xargs sed -i \
find -type f -name '*.[hc]' | xargs chmod -x
# Bundled nx-X11/extras
-# Xpm - Is needed and needs to get linked to libXcomp
# Mesa - Used by the X server
# Xcursor - Other code still references files in it
-# Xfont - Statically linked to nxarget, others?
-# Xpm
%build
@@ -716,7 +626,6 @@ chmod 755 %{buildroot}%{_libdir}/lib*.so*
#Remove extras, GL, and other unneeded headers
rm -r %{buildroot}%{_includedir}/nx/GL
-rm -r %{buildroot}%{_includedir}/nx/X11/bitmaps
rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XInput.h
rm -r %{buildroot}%{_includedir}/nx/X11/extensions/XK*.h
rm -r %{buildroot}%{_includedir}/nx/X11/extensions/*Xv*.h
@@ -725,6 +634,7 @@ 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
+ln -s -f ../../../../%{_lib}/libNX_Xinerama.so.1 %{buildroot}%{_libdir}/nx/X11/Xinerama/libXinerama.so.1
%if 0%{?fdupes:1}
%fdupes %buildroot/%_prefix
@@ -734,8 +644,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%post -n libNX_X11-6 -p /sbin/ldconfig
%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
@@ -749,8 +657,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%postun -n libNX_X11-6 -p /sbin/ldconfig
%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
@@ -808,19 +714,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%defattr(-,root,root)
%{_libdir}/libNX_Xcomposite.so.1*
-%files -n libNX_Xdamage1
-%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
@@ -939,7 +832,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%files devel
%defattr(-,root,root)
%{_libdir}/libNX_Xcomposite.so
-%{_libdir}/libNX_Xdamage.so
%{_libdir}/libNX_Xinerama.so
%{_libdir}/libNX_Xrandr.so
%{_libdir}/libNX_Xtst.so
@@ -948,11 +840,9 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/XRes.h
%{_includedir}/nx/X11/extensions/XTest.h
%{_includedir}/nx/X11/extensions/Xcomposite.h
-%{_includedir}/nx/X11/extensions/Xdamage.h
%{_includedir}/nx/X11/extensions/Xevie.h
%{_includedir}/nx/X11/extensions/Xinerama.h
%{_includedir}/nx/X11/extensions/Xrandr.h
-%{_includedir}/nx/X11/extensions/dmxext.h
%{_includedir}/nx/X11/extensions/lbxbuf.h
%{_includedir}/nx/X11/extensions/lbxbufstr.h
%{_includedir}/nx/X11/extensions/lbxdeltastr.h
@@ -963,20 +853,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/record.h
%{_includedir}/nx/X11/extensions/xf86dga1.h
%{_includedir}/nx/X11/extensions/xf86vmode.h
-%dir %{_includedir}/nx/X11/fonts
-%{_includedir}/nx/X11/fonts/bdfint.h
-%{_includedir}/nx/X11/fonts/bitmap.h
-%{_includedir}/nx/X11/fonts/bufio.h
-%{_includedir}/nx/X11/fonts/fntfil.h
-%{_includedir}/nx/X11/fonts/fntfilio.h
-%{_includedir}/nx/X11/fonts/fntfilst.h
-%{_includedir}/nx/X11/fonts/fontencc.h
-%{_includedir}/nx/X11/fonts/fontmisc.h
-%{_includedir}/nx/X11/fonts/fontmod.h
-%{_includedir}/nx/X11/fonts/fontshow.h
-%{_includedir}/nx/X11/fonts/fontutil.h
-%{_includedir}/nx/X11/fonts/fontxlfd.h
-%{_includedir}/nx/X11/fonts/pcf.h
%{_includedir}/nx/X11/misc.h
%{_includedir}/nx/X11/os.h
@@ -1006,8 +882,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/ap_keysym.h
%{_includedir}/nx/X11/keysym.h
%{_includedir}/nx/X11/keysymdef.h
-%{_includedir}/nx/X11/extensions/Print.h
-%{_includedir}/nx/X11/extensions/Printstr.h
%{_includedir}/nx/X11/extensions/XI.h
%{_includedir}/nx/X11/extensions/XIproto.h
%{_includedir}/nx/X11/extensions/XResproto.h
@@ -1015,9 +889,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/bigreqstr.h
%{_includedir}/nx/X11/extensions/composite.h
%{_includedir}/nx/X11/extensions/compositeproto.h
-%{_includedir}/nx/X11/extensions/damageproto.h
-%{_includedir}/nx/X11/extensions/damagewire.h
-%{_includedir}/nx/X11/extensions/dmxproto.h
%{_includedir}/nx/X11/extensions/panoramiXproto.h
%{_includedir}/nx/X11/extensions/randr.h
%{_includedir}/nx/X11/extensions/randrproto.h
@@ -1045,12 +916,6 @@ ln -s -f ../../../../%{_lib}/libXext.so.6 %{buildroot}%{_libdir}/nx/X11/Xinerama
%{_includedir}/nx/X11/extensions/xtraplib.h
%{_includedir}/nx/X11/extensions/xtraplibp.h
%{_includedir}/nx/X11/extensions/xtrapproto.h
-%dir %{_includedir}/nx/X11/fonts
-%{_includedir}/nx/X11/fonts/FS.h
-%{_includedir}/nx/X11/fonts/FSproto.h
-%{_includedir}/nx/X11/fonts/font.h
-%{_includedir}/nx/X11/fonts/fontstruct.h
-%{_includedir}/nx/X11/fonts/fsmasks.h
%files -n nxagent
%defattr(-,root,root)