- separated Xdmx,Xnest,Xprt,Xvfb

- added Obsoletes for X11/XFree86 X servers
- added symlinks patch, package XpConfig data (with Xprt)

Changed files:
    xorg-xserver-server.spec -> 1.13

diff --git a/xorg-xserver-server.spec b/xorg-xserver-server.spec
index 33e4d89f2373625a1635004aa2a6ef12496309c1..4ae552333182373ce6c808a286bef14e48176643 100644 (file)
--- a/xorg-xserver-server.spec
+++ b/xorg-xserver-server.spec
@@ -7,11 +7,12 @@ Name:         xorg-xserver-server
 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
@@ -73,13 +74,105 @@ Requires:  xorg-app-xkbcomp
 # 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
@@ -90,6 +183,8 @@ Requires:    xorg-proto-fontsproto-devel
 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.
@@ -100,6 +195,7 @@ Pliki nag
 %prep
 %setup -q -a1 -n xorg-server-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -134,15 +230,23 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -155,9 +259,52 @@ rm -rf $RPM_BUILD_ROOT
 %{_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)