SPECS: xorg-xserver-server.spec - separated Xdmx, Xnest, Xprt, Xvfb -...

Sun Nov 20 11:44:29 CET 2005

Author: qboosh                       Date: Sun Nov 20 10:44:29 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- separated Xdmx,Xnest,Xprt,Xvfb
- added Obsoletes for X11/XFree86 X servers
- added symlinks patch, package XpConfig data (with Xprt)

---- Files affected:
SPECS:
   xorg-xserver-server.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/xorg-xserver-server.spec
diff -u SPECS/xorg-xserver-server.spec:1.12 SPECS/xorg-xserver-server.spec:1.13

--- SPECS/xorg-xserver-server.spec:1.12	Sun Nov 20 08:18:57 2005
+++ SPECS/xorg-xserver-server.spec	Sun Nov 20 11:44:23 2005
@@ -8,11 +8,12 @@
 Version:	0.99.3
 Release:	0.1
 License:	MIT
-Group:		X11/Applications
+Group:		X11/Servers
 Source0:	http://xorg.freedesktop.org/releases/X11R7.0-RC2/xserver/xorg-server-%{version}.tar.bz2
 # Source0-md5:	82a9ccf391ee2473c456407a8eceda2d
 Source1:	http://dl.sourceforge.net/mesa3d/MesaLib-6.4.tar.bz2
 Patch0:		%{name}-ncurses.patch
+Patch1:		%{name}-symlinks.patch
 URL:		http://xorg.freedesktop.org/
 # for glx headers
 BuildRequires:	Mesa-libGL-devel
@@ -74,13 +75,105 @@
 # just for %{_includedir}/bitmaps dir
 Requires:	xorg-data-xbitmaps
 Requires:	xorg-data-xkbdata
+Obsoletes:	X11-Xserver
+Obsoletes:	X11-modules
+Obsoletes:	XFree86-Xserver
+Obsoletes:	XFree86-modules
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-X.org server.
+Xorg server is a generally used X server which uses display hardware.
+It requires proper driver for your display hardware.
 
 %description -l pl
-Serwer X.org.
+Serwer Xorg to podstawowy serwer X wyświetlający obraz na karcie
+graficznej. Do działania wymaga odpowiedniego sterownika.
+
+%package -n xorg-xserver-Xdmx
+Summary:	Xdmx - distributed multi-head X server
+Summary(pl):	Xdmx - rozproszony, wielomonitorowy serwer X
+Group:		X11/Servers
+
+%description -n xorg-xserver-Xdmx
+Xdmx - distributed multi-head X server.
+
+%description -n xorg-xserver-Xdmx -l pl
+Xdmx - rozproszony, wielomonitorowy serwer X.
+
+%package -n xorg-xserver-Xnest
+Summary:	Xnest - nested X server
+Summary(pl):	Xnest - zagnieżdżony serwer X
+Group:		X11/Servers
+Obsoletes:	X11-Xnest
+Obsoletes:	XFree86-Xnest
+
+%description -n xorg-xserver-Xnest
+Xnest is an X Window System server which runs in an X window. Xnest is
+a 'nested' window server, actually a client of the real X server,
+which manages windows and graphics requests for Xnest, while Xnest
+manages the windows and graphics requests for its own clients.
+
+%description -n xorg-xserver-Xnest -l pl
+Xnest jest serwerem X uruchamianym w okienku innego serwera X. Xnest
+zachowuje się jak klient X w stosunku do prawdziwego serwera X, a jak
+serwer X dla własnych klientów.
+
+%description -n xorg-xserver-Xnest -l ru
+Xnest - ÜÔĎ ÓĹŇ×ĹŇ X Window System, ËĎÔĎŇŮĘ ŇÁÂĎÔÁĹÔ × ĎËÎĹ X. îÁ
+ÓÁÍĎÍ ÄĹĚĹ ÜÔĎ ËĚÉĹÎÔ ŇĹÁĚŘÎĎÇĎ X-ÓĹŇ×ĹŇÁ, ËĎÔĎŇŮĘ ŐĐŇÁ×ĚŃĹÔ ĎËÎÁÍÉ É
+ÇŇÁĆÉŢĹÓËÉÍÉ ÚÁĐŇĎÓÁÍÉ ÄĚŃ Xnest × ÔĎ ×ŇĹÍŃ, ËÁË Xnest ŐĐŇÁ×ĚŃĹÔ
+ĎËÎÁÍÉ É ÇŇÁĆÉŢĹÓËÉÍÉ ÚÁĐŇĎÓÁÍÉ ÄĚŃ Ó×ĎÉČ ÓĎÂÓÔ×ĹÎÎŮČ ËĚÉĹÎÔĎ×.
+
+%description -n xorg-xserver-Xnest -l uk
+Xnest - ĂĹ ÓĹŇ×ĹŇ X Window System, ŃËÉĘ ĐŇÁĂŔ¤ Ő ×ŚËÎŚ X. ćÁËÔÉŢÎĎ ĂĹ
+ËĚŚ¤ÎÔ ŇĹÁĚŘÎĎÇĎ X-ÓĹŇ×ĹŇÁ, ŃËÉĘ ËĹŇŐ¤ ×ŚËÎÁÍÉ ÔÁ ÇŇÁĆŚŢÎÉÍÉ ÚÁĐÉÔÁÍÉ
+ÄĚŃ Xnest × ÔĎĘ ŢÁÓ, ŃË Xnest ËĹŇŐ¤ ×ŚËÎÁÍÉ ÔÁ ÇŇÁĆŚŢÎÉÍÉ ÚÁĐÉÔÁÍÉ ÄĚŃ
+Ó×Ď§Č ×ĚÁÓÎÉČ ËĚŚ¤ÎÔŚ×.
+
+%package -n xorg-xserver-Xprt
+Summary:	Xprt - Xprint server for X
+Summary(pl):	Xprt - serwer Xprint dla X
+Group:		X11/Servers
+Obsoletes:	X11-Xprt
+Obsoletes:	XFree86-Xprt
+
+%description -n xorg-xserver-Xprt
+Xprt is the Xprint print server for X Window System for non display
+devices such as printers and fax machines.
+
+%description -n xorg-xserver-Xprt -l pl
+Xprt to serwer wydruków Xprint dla X Window System dla urządzeń nie
+wyświetlających, takich jak drukarki czy faksy.
+
+%package -n xorg-xserver-Xvfb
+Summary:	Xvfb - virtual framebuffer X server
+Summary(pl):	Xvfb - serwer X z wirtualnym framebufferem
+Group:		X11/Servers
+Obsoletes:	X11-Xvfb
+Obsoletes:	XFree86-Xvfb
+
+%description -n xorg-xserver-Xvfb
+Xvfb (X Virtual Frame Buffer) is an X Window System server that is
+capable of running on machines with no display hardware and no
+physical input devices. Xvfb emulates a dumb framebuffer using virtual
+memory. Xvfb doesn't open any devices, but behaves otherwise as an X
+display. Xvfb is normally used for testing servers. Using Xvfb, the
+mfb or cfb code for any depth can be exercised without using real
+hardware that supports the desired depths. Xvfb has also been used to
+test X clients against unusual depths and screen configurations, to do
+batch processing with Xvfb as a background rendering engine, to do
+load testing, to help with porting an X server to a new platform, and
+to provide an unobtrusive way of running applications which really
+don't need an X server but insist on having one.
+
+%description -n xorg-xserver-Xvfb -l pl
+Xvfb (X Virtual Frame Buffer) jest serwerem X, który można uruchamiać
+na maszynach bez urządzeń wyświetlających ani fizycznych urządzeń
+wejściowych. Xvfb emuluje prosty framebuffer w pamięci. Zwykle jest
+używany do testowania serwerów X, może też być używany do testowania
+klientów X w rzadko używanych konfiguracjach ekranu. Można też użyć
+Xvfb do uruchomienia aplikacji, które w rzeczywistości nie wymagają
+serwera X, ale odmawiają uruchomienia bez niego.
 
 %package devel
 Summary:	Header files for X.org server
@@ -91,6 +184,8 @@
 Requires:	xorg-proto-renderproto-devel
 Requires:	xorg-proto-videoproto-devel
 Requires:	xorg-proto-xextproto-devel
+Obsoletes:	X11-Xserver-devel
+Obsoletes:	X11-XFree86-devel
 
 %description devel
 Header files for X.org server.
@@ -101,6 +196,7 @@
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -135,15 +231,23 @@
 %files
 %defattr(644,root,root,755)
 %doc ChangeLog
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/X
+%attr(755,root,root) %{_bindir}/Xorg
+%attr(755,root,root) %{_bindir}/getconfig
+%attr(755,root,root) %{_bindir}/getconfig.pl
+%attr(755,root,root) %{_bindir}/gtf
+%attr(755,root,root) %{_bindir}/in[bwl]
+%attr(755,root,root) %{_bindir}/ioport
+%attr(755,root,root) %{_bindir}/out[bwl]
+%attr(755,root,root) %{_bindir}/pcitweak
+%attr(755,root,root) %{_bindir}/scanpci
+%attr(755,root,root) %{_bindir}/xorgcfg
+%attr(755,root,root) %{_bindir}/xorgconfig
 %{_includedir}/X11/bitmaps/*
 %{_includedir}/X11/pixmaps
 %{_libdir}/X11/Cards
-%{_libdir}/X11/app-defaults/*
+%{_libdir}/X11/app-defaults/XOrgCfg
 %{_libdir}/X11/getconfig
-%{_libdir}/X11/xserver
-# broken symlinks:
-%exclude %{_libdir}/X11/xserver/C/print
 %dir %{_libdir}/xorg
 %dir %{_libdir}/xorg/modules
 %attr(755,root,root) %{_libdir}/xorg/modules/lib*.so
@@ -156,9 +260,52 @@
 %{_datadir}/X11/xkb/compiled
 %dir %{_libdir}/xserver
 %{_libdir}/xserver/SecurityPolicy
-%{_mandir}/man1/*.1*
-%{_mandir}/man4/*.4x*
-%{_mandir}/man5/*.5x*
+%{_mandir}/man1/Xorg.1*
+%{_mandir}/man1/Xserver.1x*
+%{_mandir}/man1/getconfig.1*
+%{_mandir}/man1/gtf.1*
+%{_mandir}/man1/pcitweak.1*
+%{_mandir}/man1/scanpci.1*
+%{_mandir}/man1/xorgcfg.1*
+%{_mandir}/man1/xorgconfig.1*
+%{_mandir}/man4/fbdevhw.4x*
+%{_mandir}/man5/getconfig.5x*
+%{_mandir}/man5/xorg.conf.5x*
+
+%files -n xorg-xserver-Xdmx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xdmx
+%attr(755,root,root) %{_bindir}/dmxaddinput
+%attr(755,root,root) %{_bindir}/dmxaddscreen
+%attr(755,root,root) %{_bindir}/dmxreconfig
+%attr(755,root,root) %{_bindir}/dmxresize
+%attr(755,root,root) %{_bindir}/dmxrminput
+%attr(755,root,root) %{_bindir}/dmxrmscreen
+%attr(755,root,root) %{_bindir}/dmxtodmx
+%attr(755,root,root) %{_bindir}/dmxwininfo
+%attr(755,root,root) %{_bindir}/vdltodmx
+%attr(755,root,root) %{_bindir}/xdmx
+%attr(755,root,root) %{_bindir}/xdmxconfig
+%{_mandir}/man1/Xdmx.1*
+%{_mandir}/man1/dmxtodmx.1*
+%{_mandir}/man1/vdltodmx.1*
+%{_mandir}/man1/xdmxconfig.1*
+
+%files -n xorg-xserver-Xnest
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xnest
+%{_mandir}/man1/Xnest.1*
+
+%files -n xorg-xserver-Xprt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xprt
+%{_libdir}/X11/xserver
+%{_mandir}/man1/Xprt.1*
+
+%files -n xorg-xserver-Xvfb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/Xvfb
+%{_mandir}/man1/Xvfb.1*
 
 %files devel
 %defattr(644,root,root,755)
@@ -172,6 +319,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/11/20 10:44:23  qboosh
+- separated Xdmx,Xnest,Xprt,Xvfb
+- added Obsoletes for X11/XFree86 X servers
+- added symlinks patch, package XpConfig data (with Xprt)
+
 Revision 1.12  2005/11/20 07:18:57  qboosh
 - 0.99.3 (X11R7.0-RC2), Mesa 6.4
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/xorg-xserver-server.spec?r1=1.12&r2=1.13&f=u


