X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=493be598f4d462c3f1675cc63fefc3044d1a79ca;hb=refs%2Fheads%2FRA-branch-security;hp=333226deea1ca38b87a3447b35aabb6de7f25bda;hpb=251c22f69a5ae216ed6f348a9e8191612a5f238d;p=packages%2FXFree86.git

diff --git a/XFree86.spec b/XFree86.spec
index 333226d..493be59 100644
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -1,35 +1,59 @@
 
-%define         _sver %(echo %{version} | tr -d .)
+# SECURITY: CAN-2004-0083 CAN-2004-0084 CAN-2004-0106 CAN-2004-0419
+
+# _without_tdfx		disables tdfx build
+
+%define		_sver	%(echo %{version} | tr -d .)
 
 Summary:	XFree86 Window System servers and basic programs
 Summary(de):	Xfree86 Window-System-Server und grundlegende Programme
 Summary(es):	Programas básicos y servidores para el sistema de ventanas XFree86
 Summary(fr):	Serveurs du système XFree86 et programmes de base
+Summary(ja):	XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
+Summary(ko):	X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼­µé
 Summary(pl):	XFree86 Window System wraz z podstawowymi programami
 Summary(tr):	XFree86 Pencereleme Sistemi sunucularý ve temel programlar
 Summary(pt_BR):	Programas básicos e servidores para o sistema de janelas XFree86
+Summary(ru):	âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X
+Summary(uk):	âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
+Summary(zh_CN):	XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:		XFree86
-Version:	4.2.0
-Release:	2.8
+Version:	4.2.1
+Release:	13
 License:	MIT
 Group:		X11/XFree86
-Source0:	ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz
-Source1:	ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
-Source2:	xdm.pamd
-Source3:	xserver.pamd
-Source4:	xdm.init
-Source5:	xfs.init
-Source6:	xfs.config
-Source7:	XTerm.ad-pl
-Source8:	xdm.sysconfig
-Source9:	xfs.sysconfig
-Source10:	twm.desktop
-Source11:	xclipboard.desktop
-Source12:	xconsole.desktop
-Source13:	xterm.desktop
-Source14:	xlogo64.png
-Source15:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-Source16:	cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20020310.tar.bz2
+Source0:	ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
+# Source0-md5:	ad43a8e9e39703322005cd6f7145b77f
+Source1:	ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
+# Source1-md5:	0a15b1c374256b5cad7961807baa3896
+Source2:	cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# Source2-md5:	8d43c01d364576c195a5294279f92566
+Source3:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+# Source3-md5:	a184106bb83cb27c6963944d9243ac3f
+Source4:	xdm.pamd
+Source5:	xserver.pamd
+Source6:	xdm.init
+Source7:	xfs.init
+Source8:	xfs.config
+Source9:	XTerm.ad-pl
+Source10:	xdm.sysconfig
+Source11:	xfs.sysconfig
+Source20:	twm.desktop
+Source21:	xeyes.desktop
+Source22:	xedit.desktop
+Source23:	xterm.desktop
+Source24:	xclipboard.desktop
+Source25:	xclock.desktop
+Source26:	oclock.desktop
+Source27:	xconsole.desktop
+Source30:	xlogo64.png
+Source31:	xeyes.png
+Source32:	xedit.png
+Source33:	xterm.png
+Source34:	xclipboard.png
+Source35:	xclock.png
+Source36:	oclock.png
+Source37:	xconsole.png
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-HasZlib.patch
 Patch2:		%{name}-DisableDebug.patch
@@ -59,12 +83,46 @@ Patch25:	%{name}-mkfontdir-chmod_644.patch
 Patch26:	%{name}-HasFreetype2.patch
 Patch27:	%{name}-config-s3.patch
 Patch28:	%{name}-sparc_pci_domains.patch
-Patch29:	%{name}-s3virge_mx_console_corruption_fix.patch
+Patch29:	%{name}-XTerm.ad.patch
 Patch30:	%{name}-dri_directory_mode_fix.patch
 Patch31:	%{name}-alpha_GLX_align_fix.patch
 Patch32:	%{name}-XftConfig_in_correct_place.patch
 Patch33:	%{name}-PEX+XIE.patch
 Patch34:	%{name}-xman-manpaths.patch
+Patch35:	%{name}-ppc_drivers.patch
+Patch36:	ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
+Patch37:	%{name}-clearrts.patch
+Patch38:	%{name}-mga020414.patch
+Patch39:	%{name}-trident-9397.patch
+Patch40:	%{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
+Patch41:	%{name}-nv020414.patch
+Patch42:	%{name}-fix-07-s3trio64v2gx+netfinity.patch
+Patch43:	%{name}-prosavage.patch
+Patch44:	%{name}-xtt-null-pointer.patch
+Patch45:	%{name}-i740-driver-update-cvs-20020617.patch
+Patch46:	%{name}-neomagic-Xv-support.patch
+Patch47:	%{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
+Patch48:	%{name}-tdfx-should-be-2048-not-2046.patch
+Patch49:	%{name}-tdfx-interlace.patch
+Patch50:	%{name}-tdfx-fix-compiler-warnings.patch
+Patch51:	%{name}-tdfx-fix-vtswitch-font-corruption.patch
+Patch52:	%{name}-sis-option-swcursor.patch
+Patch53:	%{name}-sis-unresolved-symbols.patch
+Patch54:	%{name}-sis-maxxfbmem-fixup.patch
+Patch55:	%{name}-Radeon9000.patch
+Patch56:	%{name}-Xfont-Type1-large-DoS.patch
+# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
+# loading failure with "debug_xform.o: no symbols"
+Patch57:	%{name}-GLcore-strip-a-workaround.patch
+# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
+Patch58:	%{name}-4.2.1-mit-shm-security.patch
+Patch59:	%{name}-disable_glide.patch
+Patch60:	%{name}-xterm-can-2003-0063.patch
+Patch61:	%{name}-xlclocale-overflow.patch
+Patch62:	%{name}-xterm-DECUDK-security-fix.patch
+Patch63:	%{name}-font-overflows.patch
+Patch64:	%{name}-bison.patch
+URL:		http://www.xfree86.org/
 BuildRequires:	bison
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 2.0.0
@@ -77,11 +135,11 @@ BuildRequires:	utempter-devel
 BuildRequires:	zlib-devel
 BuildRequires:	libstdc++-devel
 %ifarch %{ix86} alpha
-BuildRequires:	Glide3-DRI-devel
+%{!?_without_tdfx:BuildRequires:	Glide3-DRI-devel}
 %endif
 # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
 %ifarch %{ix86}
-BuildRequires:	Glide2x_SDK
+%{!?_without_tdfx:BuildRequires:	Glide2x_SDK}
 %endif
 Requires:	xauth
 Requires:	%{name}-libs = %{version}
@@ -100,7 +158,7 @@ Obsoletes:	X11R6.1
 
 # avoid Mesa dependency in XFree86-OpenGL-libs
 # Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
-%define		_noautoreqdep	libGL.so.1 libGLU.so.1 libOSMesa.so.3.3   libglide3.so.3
+%define		_noautoreqdep	libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
 
 %description
 If you want to install the X Window System (TM) on your machine,
@@ -178,6 +236,49 @@ Este pacote cont
 uma estação de trabalho X. Ele não fornece um servidor X que acessa
 seu hardware de vídeo -- estes são disponibilizados em outro pacote.
 
+%description -l ru
+X Window System ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÂÁÚÕ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÇÒÁÆÉÞÅÓËÉÈ
+ÉÎÔÅÒÆÅÊÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÑ. ðÏÐÒÏÓÔÕ ÇÏ×ÏÒÑ, X ÒÉÓÕÅÔ ÜÌÅÍÅÎÔÙ GUI ÎÁ
+ÜËÒÁÎÅ ÐÏÌØÚÏ×ÁÔÅÌÑ É ÓÔÏÉÔ ÍÅÔÏÄÙ ÄÌÑ ÐÅÒÅÄÁÞÉ ÄÅÊÓÔ×ÉÊ ÐÏÌØÚÏ×ÁÔÅÌÑ
+ÐÒÉËÌÁÄÎÙÍ ÐÒÏÇÒÁÍÍÁÍ. X ÔÁËÖÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÓÐÒÅÄÅÌÅÎÉÅ ÐÒÉÌÏÖÅÎÉÊ -
+ÚÁÐÕÓË ÐÒÏÇÒÁÍÍ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ Ó ××ÏÄÏÍ/×Ù×ÏÄÏÍ ÎÁ
+ÐÏÌØÚÏ×ÁÔÅÌØÓËÕÀ ÍÁÛÉÎÕ. X - ÜÔÏ ÍÏÝÎÁÑ ÓÒÅÄÁ, ÐÏÄÄÅÒÖÉ×ÁÀÝÁÑ
+ÍÎÏÖÅÓÔ×Ï ÐÒÉÌÏÖÅÎÉÊ, ÔÁËÉÈ ËÁË ÉÇÒÙ, ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÒÏÇÒÁÍÍÉÓÔÁ,
+ÇÒÁÆÉÞÅÓËÉÅ ÐÒÏÇÒÁÍÍÙ, ÔÅËÓÔÏ×ÙÅ ÒÅÄÁËÔÏÒÙ É Ô.Ð. XFree86 - ÜÔÏ ×ÅÒÓÉÑ
+X, ÒÁÂÏÔÁÀÝÁÑ ÎÁ Linux É ÄÒÕÇÉÈ ÓÉÓÔÅÍÁÈ.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÂÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÀ ÄÌÑ
+ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ X.
+
+äÏÐÏÌÎÉÔÅÌØÎÏ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔÙ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ
+xfs É ÂÉÂÌÉÏÔÅËÉ XFree86-libs. ÷ÏÚÍÏÖÎÏ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÖÅ ÏÄÉÎ
+ÉÌÉ ÂÏÌÅÅ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XFree86.
+
+îÕ É, ÎÁËÏÎÅÃ, ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÉÌÏÖÅÎÉÑ,
+ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, ×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ
+XFree86-devel.
+
+%description -l uk
+X Window System ÎÁÄÁ¤ ÂÁÚÕ ÄÌÑ ÒÏÚÒÏÂËÉ ÇÒÁƦÞÎÉÈ ¦ÎÔÅÒÆÅÊÓ¦×
+ËÏÒÉÓÔÕ×ÁÞÁ. ðÒÏÓÔ¦ÛÅ ËÁÖÕÞÉ, X ÍÁÌÀ¤ ÅÌÅÍÅÎÔÉ GUI ÎÁ ÅËÒÁΦ
+ËÏÒÉÓÔÕ×ÁÞÁ ÔÁ ÂÕÄÕ¤ ÍÅÔÏÄÉ ÄÌÑ ÐÅÒÅÄÁÞ¦ Ä¦Ê ËÏÒÉÓÔÕ×ÁÞÁ ÐÒÉËÌÁÄÎÉÍ
+ÐÒÏÇÒÁÍÁÍ. X ÔÁËÏÖ Ð¦ÄÔÒÉÍÕ¤ ÒÏÚÐÏÄ¦Ì ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ - ÚÁÐÕÓË
+ÐÒÏÇÒÁÍ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦ Ú ××ÏÄÏÍ/×É×ÏÄÏÍ ÎÁ ÍÁÛÉÎÕ
+ËÏÒÉÓÔÕ×ÁÞÁ. X - ÃÅ ÐÏÔÕÖÎÅ ÓÅÒÅÄÏ×ÉÝÅ, ÑËŠЦÄÔÒÉÍÕ¤ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ
+Ò¦ÚÎÉÈ ÐÒÏÇÒÁÍ, ÔÁËÉÈ ÑË ¦ÇÒÉ, ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ ÐÒÏÇÒÁͦÓÔÁ, ÇÒÁƦÞΦ
+ÐÒÏÇÒÁÍÉ, ÔÅËÓÔÏצ ÒÅÄÁËÔÏÒÉ ¦ Ô.¦. XFree86 - ÃÅ ×ÅÒÓ¦Ñ X, ÑËÁ ÐÒÁÃÀ¤
+ÎÁ Linux ÔÁ ¦ÎÛÉÈ ÓÉÓÔÅÍÁÈ.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÂÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ ÄÌÑ ÒÏÂÏÞϧ
+ÓÔÁÎæ§ X.
+
+äÏÄÁÔËÏ×Ï ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔÉ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ xfs ÔÁ
+¦Â̦ÏÔÅËÉ XFree86-libs. íÏÖÌÉ×Ï ÔÁËÏÖ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÏÄÉÎ ÁÂÏ
+ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XFree86.
+
+îÕ ¦, ÎÁÒÅÛÔ¦, ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÉËÌÁÄΦ ÐÒÏÇÒÁÍÉ, ÝÏ
+ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ ÔÁËÏÖ ÔÒÅÂÁ ÂÕÄÅ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel.
+
 %package common
 Summary:	XFree86 files required both on server and client side
 Summary(pl):	Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta
@@ -368,6 +469,8 @@ Biblioteki statyczne zawieraj
 %package Xnest
 Summary:	XFree86 Xnest server
 Summary(pl):	Serwer XFree86 Xnest
+Summary(ru):	"÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86
+Summary(uk):	"÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
 Group:		X11/XFree86/Servers
 Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
@@ -387,6 +490,25 @@ Xnest jest X serwerem uruchamianym w okienku innego X serwera. Xnest
 zachowuje siê jak X klient w stosunku do prawdziwego X serwera, a jak
 X serwer dla w³asnych klientów.
 
+%description Xnest -l ru
+Xnest - ÜÔÏ ÓÅÒ×ÅÒ X Window System, ËÏÔÏÒÙÊ ÒÁÂÏÔÁÅÔ × ÏËÎÅ X. îÁ
+ÓÁÍÏÍ ÄÅÌÅ ÜÔÏ ËÌÉÅÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ËÏÔÏÒÙÊ ÕÐÒÁ×ÌÑÅÔ ÏËÎÁÍÉ É
+ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Xnest × ÔÏ ×ÒÅÍÑ, ËÁË Xnest ÕÐÒÁ×ÌÑÅÔ
+ÏËÎÁÍÉ É ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Ó×ÏÉÈ ÓÏÂÓÔ×ÅÎÎÙÈ ËÌÉÅÎÔÏ×.
+
+÷ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ Xnest ÅÓÌÉ ×ÁÍ ÎÕÖÅÎ X-ÓÅÒ×ÅÒ, ËÏÔÏÒÙÊ ÒÁÂÏÔÁÅÔ
+ËÁË ËÌÉÅÎÔ ×ÁÛÅÇÏ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ (ÓËÏÒÅÅ ×ÓÅÇÏ, × ÔÅÓÔÏ×ÙÈ
+ÃÅÌÑÈ).
+
+%description Xnest -l uk
+Xnest - ÃÅ ÓÅÒ×ÅÒ X Window System, ÑËÉÊ ÐÒÁÃÀ¤ Õ ×¦ËΦ X. æÁËÔÉÞÎÏ ÃÅ
+Ë̦¤ÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ÑËÉÊ ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ
+ÄÌÑ Xnest × ÔÏÊ ÞÁÓ, ÑË Xnest ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ ÄÌÑ
+Ó×Ï§È ×ÌÁÓÎÉÈ Ë̦¤ÎÔ¦×.
+
+÷ÁÍ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ Xnest ÑËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÅÎ X-ÓÅÒ×ÅÒ, ÑËÉÊ ÐÒÁÃÀ¤ ÑË
+Ë̦¤ÎÔ ×ÁÛÏÇÏ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ (ÓËÏÒÛÅ ×ÓØÏÇÏ, Õ ÔÅÓÔÏ×ÉÈ Ã¦ÌÑÈ).
+
 %package Xprt
 Summary:	X print server
 Summary(pl):	X serwer z rozszerzeniem Xprint
@@ -463,6 +585,8 @@ sunucuyu deneyin.
 %package Xvfb
 Summary:	XFree86 Xvfb server
 Summary(pl):	Serwer XFree86 Xvfb
+Summary(ru):	óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
+Summary(uk):	óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
 Group:		X11/XFree86/Servers
 Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
@@ -494,14 +618,53 @@ klient
 do uruchomienia aplikacji, które w rzeczywisto¶ci nie wymagaj± X
 serwera, ale odmawiaj± uruchomienia bez niego.
 
+%description Xvfb -l ru
+Xvfb (X Virtual Frame Buffer) - ÜÔÏ X-ÓÅÒ×ÅÒ, ËÏÔÏÒÙÊ ÓÐÏÓÏÂÅÎ
+ÒÁÂÏÔÁÔØ ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ ÄÉÓÐÌÅÊÎÏÊ ÁÐÐÁÒÁÔÕÒÙ É ÆÉÚÉÞÅÓËÉÈ ÕÓÔÒÏÊÓÔ×
+××ÏÄÁ. Xvfb ÜÍÕÌÉÒÕÅÔ ÐÒÏÓÔÅÊÛÉÊ ÆÒÅÊÍÂÕÆÅÒ ÉÓÐÏÌØÚÕÑ ×ÉÒÔÕÁÌØÎÕÀ
+ÐÁÍÑÔØ. Xvfb ÎÅ ÏÔËÒÙ×ÁÅÔ ÎÉËÁËÉÈ ÕÓÔÒÏÊÓÔ×, ×ÅÄÑ ÓÅÂÑ ËÁË ÎÏÒÍÁÌØÎÙÊ
+X-ÓÅÒ×ÅÒ ×Ï ×ÓÅÍ ÏÓÔÁÌØÎÏÍ. ïÂÙÞÎÏ ÏÎ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÒÏ×ÅÒËÉ
+ÓÅÒ×ÅÒÏ×. éÓÐÏÌØÚÕÑ Xvfb, ÍÏÖÎÏ ÔÅÓÔÉÒÏ×ÁÔØ ËÏÄ mfb ÉÌÉ cfb ÄÌÑ ÌÀÂÏÊ
+ÇÌÕÂÉÎÙ Ã×ÅÔÁ ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÅÁÌØÎÏÊ ÁÐÐÁÒÁÔÕÒÙ, ÐÏÄÄÅÒÖÉ×ÁÀÝÅÊ
+ÔÁËÕÀ ÇÌÕÂÉÎÕ. Xvfb ÔÁËÖÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÒÏ×ÅÒËÉ X-ËÌÉÅÎÔÏ× Ó
+ÎÅÏÂÙÞÎÙÍÉ ÇÌÕÂÉÎÁÍÉ Ã×ÅÔÁ É ËÏÎÆÉÇÕÒÁÃÉÑÍÉ ÜËÒÁÎÁ, ÐÒÏÉÚ×ÏÄÉÔØ
+ÐÁËÅÔÎÕÀ ÏÂÒÁÂÏÔËÕ Ó Xvfb × ËÁÞÅÓÔ×Å ÆÏÎÏ×ÏÇÏ ÒÅÎÄÅÒÅÒÁ, ÐÒÏ×ÏÄÉÔØ
+ÎÁÇÒÕÚÏÞÎÙÅ ÔÅÓÔÙ, ÄÌÑ ÐÏÍÏÝÉ × ÐÏÒÔÉÒÏ×ÁÎÉÉ X-ÓÅÒ×ÅÒÁ ÎÁ ÎÏ×ÕÀ
+ÐÌÁÔÆÏÒÍÕ É ÄÌÑ ÈÉÔÒÏÕÍÎÏÇÏ ÚÁÐÕÓËÁ ÐÒÉÌÏÖÅÎÉÊ, ËÏÔÏÒÙÍ ÒÅÁÌØÎÏ ÎÅ
+ÎÕÖÅÎ X-ÓÅÒ×ÅÒ, ÎÏ ËÏÔÏÒÙÅ ÎÁÓÔÁÉ×ÁÀÔ ÎÁ ÔÏÍ, ÞÔÏ ÏÎ ÂÙÌ ÄÏÓÔÕÐÅÎ.
+
+åÓÌÉ ×ÁÍ ÎÁÄÏ ÔÅÓÔÉÒÏ×ÁÔØ ×ÁÛÉ X-ÓÅÒ×ÅÒÁ ÉÌÉ X-ËÌÉÅÎÔÙ, ×Ù ÍÏÖÅÔÅ
+ÕÓÔÁÎÏ×ÉÔØ ÄÌÑ ÜÔÏÊ ÃÅÌÉ Xvfb.
+
+%description Xvfb -l uk
+Xvfb (X Virtual Frame Buffer) - ÃÅ X-ÓÅÒ×ÅÒ, ÚÄÁÔÎÉÊ ÐÒÁÃÀ×ÁÔÉ ÎÁ
+ÍÁÛÉÎÁÈ ÂÅÚ ÄÉÓÐÌÅÊÎϧ ÁÐÁÒÁÔÕÒÉ ÔÁ צÚÉÞÎÉÈ ÐÒÉÓÔÒÏ§× ××ÏÄÕ. Xvfb
+ÅÍÕÌÀ¤ ÎÁÊÐÒÏÓÔ¦ÛÉÊ ÆÒÅÊÍÂÕÆÅÒ ×ÉËÏÒÉÓÔÏ×ÕÀÞÉ ×¦ÒÔÕÁÌØÎÕ ÐÁÍ'ÑÔØ. Xvfb
+ΊצÄËÒÉ×Á¤ ΦÑËÉÈ ÐÒÉÓÔÒϧ×, ×ÅÄÕÞÉ ÓÅÂÅ ÑË ÎÏÒÍÁÌØÎÉÊ X-ÓÅÒ×ÅÒ Õ
+ÒÅÛÔ¦ צÄÎÏÛÅÎØ. úÁÚ×ÉÞÁÊ ÊÏÇÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÌÑ ÐÅÒÅצÒËÉ ÓÅÒ×ÅÒ¦×.
+÷ÉËÏÒÉÓÔÏ×ÕÀÞÉ Xvfb, ÍÏÖÎÁ ÔÅÓÔÕ×ÁÔÉ ËÏÄ mfb ÁÂÏ cfb ÄÌÑ ÂÕÄØ-ÑËϧ
+ÇÌÉÂÉÎÉ ËÏÌØÏÒÕ ÔÁ ËÏÎƦÇÕÒÁæ§ ÅËÒÁÎÕ ÂÅÚ ×ÉËÏÒÉÓÔÁÎÎÑ ÒÅÁÌØÎϧ
+ÁÐÁÒÁÔÕÒÉ, ÑËÁ ЦÄÔÒÉÍÕ¤ ÔÁ˦ ÒÅÖÉÍÉ. ôÁËÏÖ Xvfb ÍÏÖÎÁ ×ÉËÏÒÉÓÔÁÔÉ ÄÌÑ
+ÐÅÒÅצÒËÉ X-Ë̦¤ÎÔ¦× Ú ÎÅÚ×ÉÞÎÉÍÉ ÇÌÉÂÉÎÁÍÉ ËÏÌØÏÒÕ ÔÁ ËÏÎƦÇÕÒÁæÑÍÉ
+ÅËÒÁÎÕ, ÐÒÏ×ÏÄÉÔÉ ÐÁËÅÔÎÕ ÏÂÒÏÂËÕ Ú Xvfb Õ ÑËÏÓÔ¦ ÆÏÎÏ×ÏÇÏ ÒÅÎÄÅÒÅÒÁ,
+ÐÒÏ×ÏÄÉÔÉ ÎÁÇÒÕÚÏÞΦ ÔÅÓÔÉ, ÄÌÑ ÄÏÐÏÍÏÇÉ Õ ÐÏÒÔÕ×ÁÎΦ X-ÓÅÒ×ÅÒÁ ÎÁ
+ÎÏ×Õ ÐÌÁÔÆÏÒÍÕ ÔÁ ÚÁÐÕÓËÕ ÐÒÏÇÒÁÍ, ÑËÉÍ ÒÅÁÌØÎÏ ÎÅ ÐÏÔÒ¦ÂÅÎ X-ÓÅÒ×ÅÒ,
+ÁÌÅ Ñ˦ ÎÁÐÏÌÑÇÁÀÔØ ÎÁ ÔÏÍÕ, ÝÏ צΠÂÕ× ÄÏÓÔÕÐÎÉÊ.
+
+ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÏ ÔÅÓÔÕ×ÁÔÉ ×ÁÛ¦ X-ÓÅÒ×ÅÒÉ ÁÂÏ X-Ë̦¤ÎÔÉ, ×É ÍÏÖÅÔÅ
+×ÓÔÁÎÏ×ÉÔÉ ÄÌÑ Ã¦¤§ æ̦ Xvfb.
+
 %package devel
 Summary:	X11R6 headers and programming man pages
 Summary(de):	X11R6 Headers und man pages für Programmierer
 Summary(fr):	Pages man de programmation
 Summary(pl):	Pliki nag³ówkowe X11R6
+Summary(ru):	âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÑ ÐÏ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÀ X11R6
 Summary(tr):	X11R6 ile geliþtirme için gerekli dosyalar
+Summary(uk):	â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
 Group:		X11/Libraries
 Requires:	%{name}-libs = %{version}
+Requires:	imake = %{version}
 Obsoletes:	xpm-devel
 Provides:	xpm-devel
 %ifarch sparc sparc64
@@ -537,11 +700,27 @@ i Xaw. Wi
 bibliotek mo¿esz znale¼æ w ksi±¿kach wydawnictwa O'Reilly and
 Associates (X Programming) polecanych przez Red Hata.
 
+%description devel -l ru
+XFree86-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ
+ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. XFree86-devel
+×ËÌÀÞÁÅÔ ÂÁÚÏ×ÕÀ ÂÉÂÌÉÏÔÅËÕ Xlib É ÎÁÂÏÒÙ ÐÒÉÍÉÔÉ×Ï× Xt É Xaw.
+
+õÓÔÁÎÏ×ÉÔÅ XFree86-devel ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ,
+ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ.
+
 %description devel -l tr
 X istemcisi olarak çalýþacak programlar geliþtirmek için gereken
 statik kitaplýklar, baþlýk dosyalarý ve belgeler. Xlib kitaplýðýnýn
 yanýsýra Xt ve Xaw arayüz kitaplýklarýný da içerir.
 
+%description devel -l uk
+XFree86-devel ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ, ÎÅÏÂȦÄΦ
+ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ. XFree86-devel ͦÓÔÉÔØ
+ÂÁÚÏ×Õ Â¦Â̦ÏÔÅËÕ Xlib ÔÁ ÎÁÂÏÒÉ ÐÒÉͦÔÉ×¦× Xt ÔÁ Xaw.
+
+÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
+ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
+
 %package driver-apm
 Summary:	Alliance Promotion video driver
 Summary(pl):	Sterownik do kart Alliance Promotion
@@ -584,15 +763,14 @@ ATI video driver.
 Sterownik do kart ATI.
 
 %package driver-r128
-Summary:        ATI Rage 128 video driver
-Summary(pl):    Sterownik do kart ATI Rage 128
-Group:          X11/XFree86
-Requires:       %{name}-modules = %{version}-%{release}
-Requires:       %{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-driver-ati = %{version}-%{release}
-Requires:       OpenGL
+Summary:	ATI Rage 128 video driver
+Summary(pl):	Sterownik do kart ATI Rage 128
+Group:		X11/XFree86
+Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
-Obsoletes:      XFree86-Rage128
+Obsoletes:	XFree86-Rage128
 
 %description driver-r128
 ATI Rage 128 video driver.
@@ -601,13 +779,13 @@ ATI Rage 128 video driver.
 Sterownik do kart ATI Rage 128.
 
 %package driver-radeon
-Summary:        ATI Radeon video driver
-Summary(pl):    Sterownik do kart ATI Radeon
-Group:          X11/XFree86
-Requires:       %{name}-modules = %{version}-%{release}
-Requires:       %{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-driver-ati = %{version}-%{release}
-Requires:       OpenGL
+Summary:	ATI Radeon video driver
+Summary(pl):	Sterownik do kart ATI Radeon
+Group:		X11/XFree86
+Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	XFree86-driver-ati
+Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 
 %description driver-radeon
@@ -616,6 +794,59 @@ ATI Radeon video driver.
 %description driver-radeon -l pl
 Sterownik do kart ATI Radeon.
 
+%package driver-ati.2
+Summary:	ATI video driver (ATI.2)
+Summary(pl):	Sterownik do kart ATI (ATI.2)
+Group:		X11/XFree86
+Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{version}-%{release}
+Obsoletes:	XFree86-ATI XFree86-Mach32 XFree86-Mach64
+
+%description driver-ati.2
+ATI video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
+
+%description driver-ati.2 -l pl
+Sterownik do kart ATI (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
+
+%package driver-r128.2
+Summary:	ATI Rage 128 video driver (ATI.2)
+Summary(pl):	Sterownik do kart ATI Rage 128 (ATI.2)
+Group:		X11/XFree86
+Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	OpenGL
+Requires:	XFree86-driver-ati.2
+Conflicts:	XFree86-driver-nvidia
+Obsoletes:	XFree86-Rage128
+
+%description driver-r128.2
+ATI Rage 128 video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
+
+%description driver-r128.2 -l pl
+Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
+
+%package driver-radeon.2
+Summary:	ATI Radeon video driver (ATI.2)
+Summary(pl):	Sterownik do kart ATI Radeon (ATI.2)
+Group:		X11/XFree86
+Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	XFree86-driver-ati.2
+Requires:	OpenGL
+Conflicts:	XFree86-driver-nvidia
+
+%description driver-radeon.2
+ATI Radeon video driver (ATI.2) from gatos
+(http://gatos.sourceforge.net/).
+
+%description driver-radeon.2 -l pl
+Sterownik do kart ATI Radeon (ATI.2) projektu gatos
+(http://gatos.sourceforge.net/).
+
 %package driver-chips
 Summary:	Chips and Technologies video driver
 Summary(pl):	Sterownik do kart na uk³adach Chips and Technologies
@@ -743,8 +974,8 @@ Intel i740 video driver.
 Sterownik do kart na uk³adzie Intel i740.
 
 %package driver-i810
-Summary:	Intel i810/i815 video driver
-Summary(pl):	Sterownik do grafiki na uk³adach Intel i810 i i815
+Summary:	Intel i810/i815/i830 video driver
+Summary(pl):	Sterownik do grafiki na uk³adach Intel i810/i815/i830
 Group:		X11/XFree86
 Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
@@ -753,10 +984,10 @@ Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-i810
 
 %description driver-i810
-Intel i810/i815 video driver.
+Intel i810/i815/i830 video driver.
 
 %description driver-i810 -l pl
-Sterownik do grafiki na uk³adach Intel i810 i i815.
+Sterownik do grafiki na uk³adach Intel i810/i815/i830.
 
 %package driver-mga
 Summary:	Matrox video driver
@@ -1058,11 +1289,15 @@ je
 Summary:	X11R6 shared libraries
 Summary(de):	X11R6 shared Libraries
 Summary(es):	Bibliotecas compartidas X11R6
-Summary(pl):	Biblioteki dzielone dla X11R6
 Summary(fr):	Bibliothèques partagées X11R6
+Summary(pl):	Biblioteki dzielone dla X11R6
 Summary(pt_BR):	Bibliotecas compartilhadas X11R6
+Summary(ru):	òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4)
+Summary(uk):	â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
 Group:		X11/XFree86
-PreReq:		grep
+Requires(post,postun):	/sbin/ldconfig
+Requires(post,postun):	grep
+Requires(postun):	fileutils
 Requires:	%{name}-common = %{version}
 Obsoletes:	xpm
 Provides:	xpm
@@ -1112,17 +1347,46 @@ program
 oszczêdno¶ci miejsca potrzebnego do uruchamiania aplikacji X Window na
 komputerach bez X serwera (np. przez sieæ).
 
+%description libs -l pt_BR
+Este pacote contém bibliotecas compartilhadas que a maioria dos
+programas X precisam para rodar corretamente. Eles estão em um pacote
+separado para reduzir o espaço em disco necessário para rodar
+aplicações X em uma máquina sem um servidor X (através da rede).
+
 %description libs -l tr
 Bu paket X programlarýnýn düzgün çalýþabilmeleri için gereken
 kitaplýklarý içerir. Bunlar, X programlarýný (sunucu olsun olmasýn)
 çalýþtýrmak için gerekli disk alanýný azaltmak için ayrý bir paket
 olarak sunulmuþtur.
 
-%description libs -l pt_BR
-Este pacote contém bibliotecas compartilhadas que a maioria dos
-programas X precisam para rodar corretamente. Eles estão em um pacote
-separado para reduzir o espaço em disco necessário para rodar
-aplicações X em uma máquina sem um servidor X (através da rede).
+%description libs -l ru
+XFree86-libs ÓÏÄÅÒÖÉÔ ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÙ ÄÌÑ
+ÒÁÂÏÔÙ ÂÏÌØÛÉÎÓÔ×Õ ÐÒÏÇÒÁÍÍ ÄÌÑ X. üÔÉ ÂÉÂÌÉÏÔÅËÉ ×ÙÎÅÓÅÎÙ × ÏÔÄÅÌØÎÙÊ
+ÐÁËÅÔ ÞÔÏÂÙ ÓÜËÏÎÏÍÉÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï, ÎÅÏÂÈÏÄÉÍÏÅ ÄÌÑ ÚÁÐÕÓËÁ
+ÐÒÉÌÏÖÅÎÉÊ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÁ (ÎÁÐÒÉÍÅÒ, ÐÏ ÓÅÔÉ).
+
+åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System ÎÁ ×ÁÛÅÊ ÍÁÛÉÎÅ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ
+ÕÓÔÁÎÏ×ÉÔØ XFree86-libs. ôÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:
+XFree86, ÏÄÉÎ ÉÌÉ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XFree86, Xconfigurator,
+XFree86-xfs.
+
+åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ,
+×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ XFree86-devel.
+
+%description libs -l uk
+XFree86-libs ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ, ËÏÔÒ¦
+ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÂÏÔÉ Â¦ÌØÛÏÓÔ¦ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ ÄÌÑ X. 㦠¦Â̦ÏÔÅËÉ
+×ÉÎÅÓÅΦ × ÏËÒÅÍÉÊ ÐÁËÅÔ ÄÌÑ ÅËÏÎÏͦ§ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÏÒÕ, ÎÅÏÂȦÄÎÏÇÏ
+ÄÌÑ ÚÁÐÕÓËÕ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÕ (ÎÁÐÒÉËÌÁÄ,
+ÐÏ ÍÅÒÅÖ¦).
+
+ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System ÎÁ ×ÁÛ¦Ê ÍÁÛÉΦ, ×ÁÍ ÎÅÏÂȦÄÎÏ
+×ÓÔÁÎÏ×ÉÔÉ XFree86-libs. ôÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ:
+XFree86, ÏÄÉÎ ÁÂÏ ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XFree86, Xconfigurator,
+XFree86-xfs.
+
+ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ
+ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel.
 
 %package modules
 Summary:	Modules with X servers extensions
@@ -1166,6 +1430,8 @@ XFree86 4.2.0 nie jest ju
 %package setup
 Summary:	Graphical configuration tool for XFree86
 Summary(pl):	Graficzny konfigurator dla XFree86
+Summary(ru):	õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
+Summary(uk):	õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
 Group:		X11/XFree86
 Requires:	%{name}-Xserver = %{version}
 Obsoletes:	XFree86-xf86cfg
@@ -1182,9 +1448,17 @@ skonfigurowanie ustawie
 ró¿nych rzeczy. Jednak¿e jest wolny i wymaga dostêpno¶ci serwera do
 standardowej 16-kolorowej VGA.
 
+%description setup -l ru
+õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86.
+
+%description setup -l uk
+õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86.
+
 %package static
 Summary:	X11R6 static libraries
 Summary(pl):	Biblioteki statyczne X11R6
+Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
+Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
 Group:		X11/Libraries
 Requires:	%{name}-devel = %{version}
 %ifarch sparc sparc64
@@ -1199,9 +1473,20 @@ X11R6 static libraries.
 %description static -l pl
 Biblioteki statyczne X11R6.
 
+%description static -l ru
+XFree86-static ×ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
+ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. ÓÏÂÒÁÎÎÙÅ ÐÒÏÇÒÁÍÍÙ,
+ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ.
+
+%description static -l uk
+XFree86-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ
+ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ.
+
 %package tools
 Summary:	Various tools for XFree86
 Summary(pl):	Ró¿ne narzêdzia dla XFree86
+Summary(ru):	òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86
+Summary(uk):	ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
 Group:		X11/XFree86
 Requires:	%{name} >= %{version}
 Requires:	XFree86-libs = %{version}
@@ -1238,6 +1523,55 @@ klienci X, b
 Ten pakiet zawiera aplikacje, które by³y w X11R6-contrib w starszych
 wersjach X.
 
+%description tools -l ru
+òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ X, ×ËÌÀÞÁÑ listres, xbiff, xedit, xeyes,
+xcalc, xload, xman É ÄÒÕÇÉÅ.
+
+åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System, ×ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ
+XFree86-tools. ôÁËÖÅ ×ÁÍ ÔÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÉÅ ÐÁËÅÔÙ:
+XFree86, Xconfigurator, XFree86-xfs É XFree86-libs. ÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÁÄÏ
+ÕÓÔÁÎÏ×ÉÔØ É ÄÒÕÇÉÅ ÐÁËÅÔÙ ÛÒÉÆÔÏ× XFree86.
+
+åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ,
+×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ XFree86-devel.
+
+üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ×ÓÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ ÒÁÎØÛÅ ×ËÌÀÞÁÌÉÓØ ×
+X11R6-contrib.
+
+%description tools -l uk
+ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ X, ×ËÌÀÞÁÀÞÉ listres, xbiff, xedit, xeyes,
+xcalc, xload, xman ÔÁ ¦ÎÛ¦.
+
+ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System, ×ÁÍ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ
+XFree86-tools. ôÁËÏÖ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: XFree86,
+Xconfigurator, XFree86-xfs ÔÁ XFree86-libs. íÏÖÌÉ×Ï, ×ÁÍ ÔÒÅÂÁ
+×ÓÔÁÎÏ×ÉÔÉ Ê ¦ÎÛ¦ ÐÁËÅÔÉ ÛÒÉÆÔ¦× XFree86.
+
+ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ
+ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel.
+
+ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
+
+%package -n imake
+Summary:	C preprocessor interface to the make utility
+Summary(pl):	Miedzymordzie do make oparte o preprocesor C
+Group:		Development/Building
+
+%description -n imake
+Imake is used to generate Makefiles from a template, a set of cpp
+macro functions, and a per-directory input file called an Imakefile.
+This allows machine dependencies (such as compiler options, alternate
+command names, and special make rules) to be kept separate from the
+descriptions of the various items to be built.
+
+%description -n imake -l pl
+Imake jest u¿ywany do generowania plików Makefile na bazie szablonu,
+zbioru makr preprocesora C oraz (dla ka¿dego podkatalogu) pliku
+wej¶ciowego Imakefile. Pozwala to na oddzielenie informacji zale¿nych
+od ¶rodowiska kompilacji (takich jak opcje kompilatora, alternatywne
+nazwy komend i regu³y specjalne) od opisu ró¿nych elementów które maj±
+byæ kompilowane.
+
 %package -n sessreg
 Summary:	sessreg - manage utmp/wtmp entries for non-init clients
 Summary(pl):	Program do zarz±dzania wpisami w utmp/wtmp
@@ -1262,6 +1596,8 @@ indeksowanych po
 %package -n twm
 Summary:	Tab Window Manager for the X Window System
 Summary(pl):	Twm - podstawowy zarz±dca okien dla X Window System
+Summary(ru):	ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
+Summary(uk):	ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
 Group:		X11/Window Managers
 Requires:	XFree86-libs = %{version}
 
@@ -1277,6 +1613,12 @@ ramki okien, par
 ustawianie focusu klikniêciem lub po³o¿eniem wska¼nika myszy,
 definiowalne przypisania klawiszy i przycisków myszy.
 
+%description -n twm -l ru
+ðÒÏÓÔÏÊ ËÏÍÐÁËÔÎÉÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ.
+
+%description -n twm -l uk
+ðÒÏÓÔÉÊ ËÏÍÐÁËÔÎÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ.
+
 %package -n xauth
 Summary:	xauth - X authority file utility
 Summary(pl):	xauth - narzêdzie do plików X authority
@@ -1300,14 +1642,17 @@ logowania lub udost
 %package -n xdm
 Summary:	xdm - X Display Manager with support for XDMCP, host chooser
 Summary(pl):	XDM - display mened¿er z obs³ug± XDMCP i wybieraniem hostów
+Summary(ru):	íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
+Summary(uk):	íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
 Group:		X11/XFree86
+PreReq:		rc-scripts
+Requires(post,preun):	/sbin/chkconfig
 Requires:	%{name} = %{version}
 Requires:	pam >= 0.71
 Requires:	%{name}-libs = %{version}
 Requires:	sessreg = %{version}
 Requires:	/usr/X11R6/bin/sessreg
 Provides:	XDM
-PreReq:		chkconfig
 Obsoletes:	XFree86-xdm
 Obsoletes:	gdm
 Obsoletes:	kdm
@@ -1323,17 +1668,26 @@ Xdm zarz
 zdalnych serwerach. Zosta³ zaprojektowany zgodnie z potrzebami X
 terminali oraz standardem X Consortium XDMCP.
 
+%description -n xdm -l ru
+íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X.
+
+%description -n xdm -l uk
+íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X.
+
 %package -n xfs
 Summary:	Font server for XFree86
 Summary(pl):	Serwer fontów dla XFree86
+Summary(ru):	æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
+Summary(uk):	æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
 Group:		X11/XFree86
 Requires:	%{name}-libs = %{version}
 Requires:	XFree86-fonts-base
-PreReq:		chkconfig
+PreReq:		rc-scripts
 Requires(pre):	/bin/id
 Requires(pre):	/usr/bin/getgid
 Requires(pre):	/usr/sbin/useradd
 Requires(pre):	/usr/sbin/groupadd
+Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Obsoletes:	xfsft XFree86-xfs
@@ -1348,6 +1702,28 @@ installed on the remote computer.
 Pakiet zawiera serwer fontów dla XFree86. Mo¿e udostêpniaæ fonty dla X
 serwerów lokalnych lub zdalnych.
 
+%description -n xfs -l ru
+XFree86-xfs ÓÏÄÅÒÖÉÔ ÓÅÒ×ÅÒ ÛÒÉÆÔÏ× ÄÌÑ XFree86. Xfs ÔÁËÖÅ ÍÏÖÅÔ
+ÐÒÅÄÏÓÔÁ×ÌÑÔØ ÛÒÉÆÔÙ ÕÄÁÌÅÎÎÙÍ X-ÓÅÒ×ÅÒÁÍ. õÄÁÌÅÎÎÁÑ ÓÉÓÔÅÍÁ ÂÕÄÅÔ
+ÓÐÏÓÏÂÎÁ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÅ ÛÒÉÆÔÙ, ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÒ×ÅÒÅ ÛÒÉÆÔÏ×,
+ÄÁÖÅ ÅÓÌÉ ÏÎÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ.
+
+÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ XFree86-xfs ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window
+System. ôÁËÖÅ ×ÁÍ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ: XFree86,
+ÐÁËÅÔ(Ù) ÛÒÉÆÔÏ× XFree86, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ, Xconfigurator
+É XFree86-libs.
+
+%description -n xfs -l uk
+XFree86-xfs ͦÓÔÉÔØ ÓÅÒ×ÅÒ ÛÒÉÆÔ¦× ÄÌÑ XFree86. Xfs ÔÁËÏÖ ÍÏÖÅ
+ÎÁÄÁ×ÁÔÉ ÛÒÉÆÔÉ ×¦ÄÄÁÌÅÎÉÍ X-ÓÅÒ×ÅÒÁÍ. ÷¦ÄÄÁÌÅÎÁ ÓÉÓÔÅÍÁ ÚÍÏÖÅ
+×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓ¦ ÛÒÉÆÔÉ, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ÓÅÒ×ÅÒ¦ ÛÒÉÆÔ¦×, ÎÁצÔØ
+ÑËÝÏ ×ÏÎÉ ÎÅ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦.
+
+÷É ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ XFree86-xfs ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window
+System. ôÁËÏÖ ×ÁÍ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÎÁÓÔÕÐΦ ÐÁËÅÔÉ: XFree86,
+ÐÁËÅÔ(É) ÛÒÉÆÔ¦× XFree86, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator
+ÔÁ XFree86-libs.
+
 #--- %prep ---------------------------
 
 %prep
@@ -1385,20 +1761,51 @@ serwer
 # needs updating (14 rejects)
 #%patch28 -p1
 %endif
-# don't see what exatly it is doing, is it needed now?
-# could someone else look at it (rejects)
-#%patch29 -p1
+%patch29 -p1
 %patch30 -p1
 %patch31 -p1
 %patch32 -p1
 %patch33 -p1
-%patch35 -p1
+%patch34 -p1
+%ifarch ppc
+%patch35
+%endif
+%{?_without_tdfx:%patch35}
+%patch36 -p0
+%patch37 -p1
+%patch38 -p1
+#%patch39 -p1
+%patch40 -p0
+%patch41 -p1
+%patch42 -p1
+%patch43 -p1
+%patch44 -p1
+%patch45 -p1
+%patch46 -p1
+%{!?_without_tdfx:%patch47 -p0}
+%{!?_without_tdfx:%patch48 -p0}
+%{!?_without_tdfx:%patch49 -p1}
+#%patch50 -p0
+%{!?_without_tdfx:%patch51 -p0}
+#%patch52 -p1
+#%patch53 -p1
+%patch54 -p1
+%patch55 -p0
+%patch56 -p1
+%{!?debug:%patch57 -p1}
+%patch58 -p0
+%{?_without_tdfx:%patch59 -p0}
+%patch60 -p1
+%patch61 -p0
+%patch62 -p0
+%patch63 -p1
+%patch64 -p1
 
 rm -f xc/config/cf/host.def
 
 # New ATI drivers
 cd xc/programs/Xserver/hw/xfree86/drivers
-bzcat %{SOURCE16} | tar x
+bzcat %{SOURCE2} | tar x
 # ati.2 directory
 
 #--- %build --------------------------
@@ -1429,8 +1836,8 @@ install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysc
 	$RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT/usr/{bin,include,lib} \
 	$RPM_BUILD_ROOT/var/{log,lib/xkb} \
-	$RPM_BUILD_ROOT{%{_applnkdir}/{Utilities,Terminals},%{_pixmapsdir}/mini} \
-	$RPM_BUILD_ROOT%{_wmpropsdir}
+	$RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
+	$RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir}}
 
 %{__make} -C xc	"DESTDIR=$RPM_BUILD_ROOT" \
 		"DOCDIR=/usr/share/doc/%{name}-%{version}" \
@@ -1444,9 +1851,12 @@ install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysc
 		install install.man
 
 %ifnarch alpha
-install -d $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2/
+install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
 install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
-	$RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati.2/
+	$RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
+install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
+	$RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
+
 %endif
 
 # setting default X
@@ -1454,12 +1864,12 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/X
 ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
 
 # setting ghost X in /etc/X11 -- xf86config will fix this ...
-ln -sf ../..%{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
+ln -sf %{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
 
 # add X11 links in /usr/bin, /usr/lib /usr/include
-ln -sf ../X11R6/include/X11 $RPM_BUILD_ROOT/usr/include/X11
-ln -sf ../X11R6/lib/X11 $RPM_BUILD_ROOT/usr/lib/X11
-ln -sf ../X11R6/bin $RPM_BUILD_ROOT/usr/bin/X11
+ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11
+ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11
+ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11
 
 # fix libGL*.so links
 rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so
@@ -1468,27 +1878,31 @@ ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
 
 # set up PLD xdm config
 rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
-install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps/
-install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/
-
-install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xdm
-install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xserver
-install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
-install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
-install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
-
-install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/xdm
-install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/xfs
-
-install %{SOURCE10} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
-install %{SOURCE11} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE12} $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE13} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
-
-install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-
-bzip2 -dc %{SOURCE15} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
+install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm
+
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/xserver
+install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
+install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
+install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
+install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
+
+install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
+install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
+
+install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
+install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements
+install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors
+install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
+install %{SOURCE24}  %{SOURCE25} %{SOURCE26} %{SOURCE27} \
+		$RPM_BUILD_ROOT%{_applnkdir}/Utilities
+install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
+	%{SOURCE36} %{SOURCE37} \
+	$RPM_BUILD_ROOT%{_pixmapsdir}
+
+bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
 > $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 > $RPM_BUILD_ROOT/etc/security/blacklist.xserver
@@ -1500,8 +1914,7 @@ ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts
 rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp
 ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
 
-ln -sf ../../../share/doc/%{name}-%{version} \
-	$RPM_BUILD_ROOT%{_libdir}/X11/doc
+ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc
 
 rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
 
@@ -1567,13 +1980,14 @@ fi
 %triggerpostun modules -- XFree86-modules < 4.0.2
 if [ -d /usr/X11R6/lib/X11/xkb ]; then
 	rm -rf /usr/X11R6/lib/X11/xkb
-	ln -sf ../../../../etc/X11/xkb /usr/X11R6/lib/X11/xkb
+	ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
 fi
 
 %post -n xdm
 /sbin/chkconfig --add xdm
 if [ -f /var/lock/subsys/xdm ]; then
-	/etc/rc.d/init.d/xdm restart >&2
+	echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+	echo "WARNING: it will terminate all sessions opened from xdm!" >&2
 else
 	echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
 fi
@@ -1589,7 +2003,7 @@ fi
 %pre -n xfs
 if [ -n "`/usr/bin/getgid xfs`" ]; then
 	if [ "`/usr/bin/getgid xfs`" != "56" ]; then
-		echo "Warning: group xfs hasn't gid=56. Correct this before installing xfs." 1>&2
+		echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
 		exit 1
 	fi
 else
@@ -1597,7 +2011,7 @@ else
 fi
 if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then
 	if [ "`/bin/id -u xfs`" != "56" ]; then
-		echo "Warning: user xfs hasn't uid=56. Corrent this before installing xfs." 1>&2
+		echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
 		exit 1
 	fi
 else
@@ -1635,6 +2049,7 @@ fi
 %doc %{_libdir}/X11/doc
 %endif
 
+%{_libdir}/X11/app-defaults/UXTerm
 %{_libdir}/X11/app-defaults/XCalc
 %{_libdir}/X11/app-defaults/XCalc-color
 %{_libdir}/X11/app-defaults/XClipboard
@@ -1646,9 +2061,6 @@ fi
 %{_libdir}/X11/app-defaults/XTerm
 %lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
 %{_libdir}/X11/app-defaults/XTerm-color
-%ifnarch sparc sparc64
-%{_libdir}/X11/app-defaults/XF86Cfg
-%endif
 
 %attr(755,root,root) %{_libdir}/X11/lbxproxy
 %attr(755,root,root) %{_libdir}/X11/proxymngr
@@ -1690,6 +2102,7 @@ fi
 %attr(755,root,root) %{_bindir}/iceauth
 %attr(755,root,root) %{_bindir}/lbxproxy
 %attr(755,root,root) %{_bindir}/lndir
+%attr(755,root,root) %{_bindir}/luit
 %attr(755,root,root) %{_bindir}/makeg
 %attr(755,root,root) %{_bindir}/makestrs
 %attr(755,root,root) %{_bindir}/mergelib
@@ -1705,6 +2118,7 @@ fi
 %attr(755,root,root) %{_bindir}/smproxy
 %attr(755,root,root) %{_bindir}/startx
 %attr(755,root,root) %{_bindir}/sxpm
+%attr(755,root,root) %{_bindir}/uxterm
 %attr(755,root,root) %{_bindir}/xcmsdb
 %attr(755,root,root) %{_bindir}/xconsole
 %attr(755,root,root) %{_bindir}/xcutsel
@@ -1758,10 +2172,9 @@ fi
 %{_mandir}/man1/editres.1*
 %{_mandir}/man1/iceauth.1*
 %{_mandir}/man1/lbxproxy.1*
-%ifnarch alpha
 %{_mandir}/man1/libxrx.1*
-%endif
 %{_mandir}/man1/lndir.1*
+%{_mandir}/man1/luit.1x*
 %{_mandir}/man1/makestrs.1*
 %{_mandir}/man1/makeg.1*
 %{_mandir}/man1/mkdirhier.1*
@@ -1886,18 +2299,17 @@ fi
 
 %files OpenGL-core
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/glxgears
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
-%ifnarch sparc sparc64
+%attr(755,root,root) %{_libdir}/libGL.so
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
 %attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
-%endif
+%{_mandir}/man1/glxgears.1x*
 
 %files OpenGL-devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libGL*.so
-%ifnarch alpha
+%attr(755,root,root) %{_libdir}/libGLU.so
 %attr(755,root,root) %{_libdir}/libOSMesa*.so
-%endif
 %{_libdir}/libGLw.a
 %dir %{_includedir}/GL
 %attr(644,root,root) %{_includedir}/GL/*
@@ -1909,18 +2321,14 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glxinfo
 %attr(755,root,root) %{_libdir}/libGLU.so.*.*
-%ifnarch alpha
 %attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
-%endif
 %{_mandir}/man1/glxinfo.1*
 
 %files OpenGL-static
 %defattr(644,root,root,755)
 %{_libdir}/libGL.a
 %{_libdir}/libGLU.a
-%ifnarch alpha
 %{_libdir}/libOSMesa*.a
-%endif
 
 %files Xnest
 %defattr(644,root,root,755)
@@ -1956,30 +2364,32 @@ fi
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/gccmakedep
 %attr(755,root,root) %{_bindir}/bdftopcf
 %attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so
 %attr(755,root,root) %{_libdir}/libI*.so
 %attr(755,root,root) %{_libdir}/libS*.so
-%ifnarch alpha
 %attr(755,root,root) %{_libdir}/libx*.so
-%endif
+%{_libdir}/libfntstubs.a
+%{_libdir}/libfontenc.a
 %{_libdir}/libFS.a
+%{_libdir}/libI810XvMC.a
+%{_libdir}/liboldX.a
 %{_libdir}/libXau.a
 %{_libdir}/libXdmcp.a
+%{_libdir}/libxf86config.a
 %{_libdir}/libXfontcache.a
+%{_libdir}/libXinerama.a
+%{_libdir}/libxkbfile.a
+%{_libdir}/libxkbui.a
+%{_libdir}/libXrandr.a
 %{_libdir}/libXss.a
+%{_libdir}/libXTrap.a
+%{_libdir}/libXv.a
+%{_libdir}/libXvMC.a
 %{_libdir}/libXxf86dga.a
 %{_libdir}/libXxf86misc.a
 %{_libdir}/libXxf86rush.a
 %{_libdir}/libXxf86vm.a
-%{_libdir}/liboldX.a
-%{_libdir}/libxkbfile.a
-%{_libdir}/libxkbui.a
-%{_libdir}/libXv.a
-%{_libdir}/libfntstubs.a
-%{_libdir}/libxf86config.a
-%{_libdir}/libXinerama.a
 %{_includedir}/X11/*.h
 %{_includedir}/X11/ICE
 %{_includedir}/X11/PM
@@ -1996,13 +2406,6 @@ fi
 %{_includedir}/xf86*.h
 %{_libdir}/X11/config
 
-%attr(755,root,root) %{_bindir}/imake
-%attr(755,root,root) %{_bindir}/makedepend
-%attr(755,root,root) %{_bindir}/xmkmf
-
-%{_mandir}/man1/imake.1*
-%{_mandir}/man1/makedepend.1*
-%{_mandir}/man1/xmkmf.1*
 %{_mandir}/man3/[A-EH-Z]*
 
 %ifnarch sparc sparc64 alpha ppc
@@ -2047,10 +2450,10 @@ fi
 %endif
 
 %ifnarch sparc sparc64 alpha ppc
-%files driver-glide
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{!?_without_tdfx:%files driver-glide}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o}
+%{!?_without_tdfx:%{_mandir}/man4/glide*}
 %endif
 
 %files driver-glint
@@ -2080,6 +2483,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
 %{_mandir}/man4/i810*
 %endif
 
@@ -2098,23 +2502,18 @@ fi
 %{_mandir}/man4/neomagic*
 %endif
 
-%ifnarch sparc sparc64 ppc
+%ifnarch sparc sparc64
 %files driver-nv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
 %{_mandir}/man4/nv*
 %endif
 
-%ifnarch alpha
+
 %files driver-ati
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
-%dir %{_libdir}/modules/drivers/ati.2
-%attr(755,root,root) %{_libdir}/modules/drivers/ati.2/ati*_drv.o
-%attr(755,root,root) %{_libdir}/modules/multimedia/*.o
-%endif
 
-%ifnarch alpha
 %files driver-r128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
@@ -2122,15 +2521,41 @@ fi
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
 %{_mandir}/man4/r128*
-%endif
 
-%ifnarch alpha
 %files driver-radeon
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
 %ifnarch sparc sparc64
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %endif
+
+
+%ifnarch alpha
+%files driver-ati.2
+%defattr(644,root,root,755)
+%dir %{_libdir}/modules.gatos/drivers
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
+%endif
+
+%ifnarch alpha
+%files driver-r128.2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
+%ifnarch sparc sparc64
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
+%endif
+%{_mandir}/man4/r128*
+%endif
+
+%ifnarch alpha
+%files driver-radeon.2
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
+%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
+%ifnarch sparc sparc64
+%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
+%endif
 %endif
 
 %ifnarch sparc sparc64 ppc
@@ -2154,25 +2579,27 @@ fi
 #%{_mandir}/man4/s3*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64
 %files driver-savage
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
 %{_mandir}/man4/savage*
 %endif
 
-%ifnarch sparc sparc64 alpha ppc
+%ifnarch sparc sparc64 ppc
 %files driver-siliconmotion
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
 %{_mandir}/man4/siliconmotion*
 %endif
 
-%ifnarch sparc sparc64 alpha ppc
+%ifnarch sparc sparc64 alpha
 %files driver-sis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
+%ifnarch ppc
 %attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
+%endif
 %{_mandir}/man4/sis*
 %endif
 
@@ -2226,12 +2653,12 @@ fi
 %{_mandir}/man4/suntcx*
 %endif
 
-%ifnarch sparc sparc64
-%files driver-tdfx
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
-%{_mandir}/man4/tdfx*
+%ifnarch sparc sparc64 ppc
+%{!?_without_tdfx:%files driver-tdfx}
+%{!?_without_tdfx:%defattr(644,root,root,755)}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o}
+%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
+%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
 %endif
 
 %ifnarch sparc sparc64 ppc
@@ -2294,9 +2721,7 @@ fi
 %attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so.*.*
 %attr(755,root,root) %{_libdir}/libI*.so.*.*
 %attr(755,root,root) %{_libdir}/libS*.so.*.*
-%ifnarch alpha
 %attr(755,root,root) %{_libdir}/libx*.so.*.*
-%endif
 %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig
 
 %files modules
@@ -2306,10 +2731,7 @@ fi
 %{_sysconfdir}/X11/xkb
 /var/lib/xkb
 %dir %{_libdir}/modules
-%ifnarch alpha
 %dir %{_libdir}/modules/dri
-%endif
-%dir %{_libdir}/modules/multimedia
 %dir %{_libdir}/modules/drivers
 %ifnarch sparc sparc64 ppc
 %{_libdir}/modules/*.uc
@@ -2335,12 +2757,15 @@ fi
 %attr(755,root,root) %{_libdir}/X11/xserver
 %dir /etc/X11/xserver
 /etc/X11/xserver/SecurityPolicy
+#%{_mandir}/man1/xtr*
 %{_mandir}/man1/xkbcomp.1*
 %{_mandir}/man4/citron*
+%{_mandir}/man4/dmc.4*
 %{_mandir}/man4/dynapro*
 %{_mandir}/man4/keyboard*
 %{_mandir}/man4/microtouch*
 %{_mandir}/man4/mouse*
+%{_mandir}/man4/penmount.4*
 %{_mandir}/man4/v4l*
 %ifnarch sparc sparc64
 %{_mandir}/man4/vga*
@@ -2371,6 +2796,7 @@ fi
 %endif
 %attr(755,root,root) %{_bindir}/xf86cfg
 %attr(755,root,root) %{_bindir}/xf86config
+%{_libdir}/X11/app-defaults/XF86Cfg
 %ifnarch ppc
 %{_mandir}/man1/scanpci.1*
 %endif
@@ -2428,6 +2854,7 @@ fi
 %attr(755,root,root) %{_bindir}/rman
 %attr(755,root,root) %{_bindir}/xtrap*
 %attr(755,root,root) %{_bindir}/texteroids
+%{_libdir}/X11/xedit
 %{_libdir}/X11/xman.help
 %{_mandir}/man1/beforelight.1*
 %{_mandir}/man1/ico.1*
@@ -2457,7 +2884,7 @@ fi
 %{_mandir}/man1/xlogo.1*
 %{_mandir}/man1/oclock.1*
 %{_mandir}/man1/rman.1*
-%{_mandir}/man1/xtrap.1*
+%{_mandir}/man1/xtr*
 %{_mandir}/man1/texteroids.1*
 
 %lang(it) %{_mandir}/it/man1/xload.1*
@@ -2485,6 +2912,21 @@ fi
 %{_libdir}/X11/app-defaults/Xditview-chrtr
 
 %{_applnkdir}/Utilities/xclipboard.desktop
+%{_applnkdir}/Utilities/oclock.desktop
+%{_applnkdir}/Utilities/xclock.desktop
+%{_applnkdir}/Editors/xedit.desktop
+%{_applnkdir}/Amusements/xeyes.desktop
+
+%files -n imake
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/gccmakedep
+%attr(755,root,root) %{_bindir}/imake
+%attr(755,root,root) %{_bindir}/makedepend
+%attr(755,root,root) %{_bindir}/xmkmf
+
+%{_mandir}/man1/imake.1*
+%{_mandir}/man1/makedepend.1*
+%{_mandir}/man1/xmkmf.1*
 
 %files -n sessreg
 %defattr(644,root,root,755)