X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=44d288130c45e85a583e6b939f44576e7548d7a5;hb=3669767061b38f3effffe50657f928e77f3264c6;hp=8b4d9a75a0884e1c37b7b13bddaba514ee0c5e75;hpb=66fac7c2f6a429b745538e3575aa2be23e408736;p=packages%2FXFree86.git

diff --git a/XFree86.spec b/XFree86.spec
index 8b4d9a7..44d2881 100644
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -8,7 +8,7 @@
 #
 
 %define		_sver	%(echo %{version} | tr -d .)
-%define		_synaptics_ver	0.11.4
+%define		_synaptics_ver	0.11.8
 
 Summary:	XFree86 Window System servers and basic programs
 Summary(de):	XFree86 Window-System-Server und grundlegende Programme
@@ -23,12 +23,13 @@ Summary(ru):	
 Summary(uk):	âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):	XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:		XFree86
-Version:	4.3.99.12
+Version:	4.3.99.15
 Release:	0.1
+Epoch:		1
 License:	MIT
 Group:		X11/XFree86
 Source0:	ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5:	12820de14d53c61cc84a0f20109f1743
+# Source0-md5:	ae7ec191348888bc9f83318e55a009e1
 #Source1:	ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
 #Source2:	ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
 Source3:	ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
@@ -61,10 +62,17 @@ Source38:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-X
 # Source38-md5:	a184106bb83cb27c6963944d9243ac3f
 #Source39:	cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
 # http://w1.894.telia.com/~u89404340/touchpad/index.html
-Source40:	http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5:	c07ffb03e93aefebc0570fe638939e27
+Source40:	http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-%{_synaptics_ver}.tar.bz2
+# Source40-md5:	48c6e9abc68672d5167f1b699b89005e
 Source41:	http://www.linux.org.uk/~alan/S3.zip
 # Source41-md5:	8b754fc6bbded60b683563b945e384b0
+Source42:	twm-xsession.desktop
+Source43:	xcalc.desktop
+Source44:	xload.desktop
+Source45:	xmag.desktop
+Source46:	xcalc.png
+Source47:	xload.png
+Source48:	xmag.png
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-HasZlib.patch
 Patch2:		%{name}-DisableDebug.patch
@@ -90,7 +98,7 @@ Patch21:	%{name}-r128-busmstr2.patch
 Patch22:	%{name}-neomagic_swcursor.patch
 Patch23:	%{name}-mga-busmstr.patch
 Patch24:	%{name}-agpgart-load.patch
-Patch25:	%{name}-symbols.patch
+Patch25:	%{name}-xterm-fix.patch
 Patch26:	%{name}-HasFreetype2.patch
 Patch27:	%{name}-config-s3.patch
 Patch28:	%{name}-sparc_pci_domains.patch
@@ -116,6 +124,8 @@ Patch45:	%{name}-spencode-nowarning.patch
 Patch46:	%{name}-lock.patch
 Patch47:	%{name}-linux-version.patch
 Patch48:	%{name}-new-s3-nodebug.patch
+Patch49:	%{name}-mandir-fix.patch
+Patch50:	%{name}-xterm-256colors.patch
 URL:		http://www.xfree86.org/
 BuildRequires:	%{_bindir}/perl
 BuildRequires:	bison
@@ -137,8 +147,9 @@ BuildRequires:	zlib-devel
 %ifarch %{ix86}
 %{!?_without_tdfx:BuildRequires:	Glide2x_SDK}
 %endif
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Requires:	xauth
+Requires:	pam >= 0.77.3
 ExclusiveArch:	%{ix86} alpha sparc m68k armv4l noarch ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	xpm-progs
@@ -155,6 +166,7 @@ Obsoletes:	X11R6.1
 %define		_soundsdir	/usr/share/sounds
 %define		_themesdir	/usr/share/themes
 %define		_wmpropsdir	/usr/share/wm-properties
+%define		_xsessdir	/usr/share/xsessions
 
 # avoid Mesa dependency in XFree86-OpenGL-libs
 # Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
@@ -306,7 +318,7 @@ wy
 Summary:	Header files for Display PostScript
 Summary(pl):	Pliki nag³ówkowe dla Display PostScript
 Group:		X11/XFree86
-Requires:	%{name}-DPS = %{version}
+Requires:	%{name}-DPS = %{epoch}:%{version}
 Obsoletes:	dgs-devel
 
 %description DPS-devel
@@ -319,7 +331,7 @@ Pliki nag
 Summary:	Display PostScript static libraries
 Summary(pl):	Biblioteki statyczne Display PostScript
 Group:		X11/XFree86
-Requires:	%{name}-DPS-devel = %{version}
+Requires:	%{name}-DPS-devel = %{epoch}:%{version}
 Obsoletes:	dgs-static
 
 %description DPS-static
@@ -332,7 +344,7 @@ Statyczne biblioteki X-Window Display PostScript.
 Summary:	OpenGL support for X11R6
 Summary(pl):	Wsparcie OpenGL dla systemu X11R6
 Group:		X11/Libraries
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Requires:	XFree86-OpenGL-libGL
 Obsoletes:	XFree86-driver-nvidia
 
@@ -346,7 +358,7 @@ Wsparcie OpenGL dla systemu X11R6.
 Summary:	OpenGL support for X11R6 - GL library
 Summary(pl):	Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
 Group:		X11/Libraries
-Requires:	XFree86-OpenGL-core = %{version}
+Requires:	XFree86-OpenGL-core = %{epoch}:%{version}
 Obsoletes:	XFree86-driver-firegl
 Conflicts:	OpenGL-core < 4.3.99.12
 
@@ -361,7 +373,7 @@ Summary:	OpenGL for X11R6 development
 Summary(pl):	Pliki nag³ówkowe OpenGL dla systemu X11R6
 Group:		X11/Development/Libraries
 Requires:	OpenGL-devel-base
-Requires:	%{name}-OpenGL-libs = %{version}
+Requires:	%{name}-OpenGL-libs = %{epoch}:%{version}
 Requires:	%{name}-devel
 Provides:	OpenGL-devel
 Obsoletes:	Mesa-devel
@@ -379,7 +391,7 @@ Summary:	OpenGL for X11R6 development (only gl?.h)
 Summary(pl):	Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
 Group:		X11/Development/Libraries
 Requires:	OpenGL-devel
-Requires:	%{name}-OpenGL-libs = %{version}
+Requires:	%{name}-OpenGL-libs = %{epoch}:%{version}
 Requires:	%{name}-devel
 Provides:	OpenGL-devel-base
 
@@ -394,7 +406,7 @@ Summary:	OpenGL libraries for X11R6
 Summary(pl):	Biblioteki OpenGL dla systemu X11R6
 Group:		X11/Libraries
 Requires:	%{name}-OpenGL-core
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Provides:	OpenGL
 Obsoletes:	%{name}-OpenGL
 Obsoletes:	Mesa
@@ -409,7 +421,7 @@ Biblioteki OpenGL dla systemu X11R6.
 Summary:	X11R6 static libraries with OpenGL
 Summary(pl):	Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
 Group:		X11/Development/Libraries
-Requires:	%{name}-OpenGL-devel = %{version}
+Requires:	%{name}-OpenGL-devel = %{epoch}:%{version}
 Provides:	OpenGL-static
 Obsoletes:	Mesa-static
 
@@ -426,7 +438,7 @@ Summary(ru):	"
 Summary(uk):	"÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
 Group:		X11/XFree86/Servers
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-base
 
 %description Xnest
@@ -468,7 +480,7 @@ Summary(pl):	X serwer z rozszerzeniem Xprint
 Group:		X11/XFree86/Servers
 PreReq:		xprint-initrc
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-base
 
 %description Xprt
@@ -486,7 +498,7 @@ Summary(pl):	Serwer XFree86
 Summary(tr):	XFree86 sunucusu
 Group:		X11/XFree86/Servers
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-base
 Requires:	pam
 Obsoletes:	XFree86-Mono
@@ -547,7 +559,7 @@ Summary(ru):	
 Summary(uk):	óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
 Group:		X11/XFree86/Servers
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-fonts-base
 
 %description Xvfb
@@ -621,8 +633,8 @@ Summary(ru):	
 Summary(tr):	X11R6 ile geliþtirme için gerekli dosyalar
 Summary(uk):	â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
 Group:		X11/Development/Libraries
-Requires:	%{name}-libs = %{version}
-Requires:	imake = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
+Requires:	imake = %{epoch}:%{version}
 Provides:	xpm-devel
 Obsoletes:	xpm-devel
 %ifarch sparc sparc64
@@ -683,7 +695,7 @@ XFree86-devel ͦ
 Summary:	Header files for XFree86 Xserver drivers/extensions development
 Summary(pl):	Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}
 
 %description Xserver-devel
 Header files for XFree86 Xserver drivers and extensions development.
@@ -696,8 +708,8 @@ XFree86.
 Summary:	Alliance Promotion video driver
 Summary(pl):	Sterownik do kart Alliance Promotion
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Alliance
 
 %description driver-apm
@@ -710,8 +722,8 @@ Sterownik do kart Alliance Promotion.
 Summary:	Ark Logic video driver
 Summary(pl):	Sterownik do kart Ark Logic
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-ark
 Ark Logic driver.
@@ -723,8 +735,8 @@ Sterownik do kart Ark Logic.
 Summary:	ATI video driver
 Summary(pl):	Sterownik do kart ATI
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-ATI
 Obsoletes:	XFree86-Mach32
 Obsoletes:	XFree86-Mach64
@@ -740,8 +752,8 @@ Summary:	ATI Rage 128 video driver
 Summary(pl):	Sterownik do kart ATI Rage 128
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-Rage128
 
@@ -756,8 +768,8 @@ Summary:	ATI Radeon video driver
 Summary(pl):	Sterownik do kart ATI Radeon
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati
 Conflicts:	XFree86-driver-nvidia
 
@@ -771,8 +783,8 @@ Sterownik do kart ATI Radeon.
 Summary:	ATI video driver (ATI.2)
 Summary(pl):	Sterownik do kart ATI (ATI.2)
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-ATI
 Obsoletes:	XFree86-Mach32
 Obsoletes:	XFree86-Mach64
@@ -789,8 +801,8 @@ Summary:	ATI Rage 128 video driver (ATI.2)
 Summary(pl):	Sterownik do kart ATI Rage 128 (ATI.2)
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati.2
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-Rage128
@@ -808,8 +820,8 @@ Summary:	ATI Radeon video driver (ATI.2)
 Summary(pl):	Sterownik do kart ATI Radeon (ATI.2)
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Requires:	%{name}-driver-ati.2
 Conflicts:	XFree86-driver-nvidia
 
@@ -825,8 +837,8 @@ Sterownik do kart ATI Radeon (ATI.2) projektu gatos
 Summary:	Chips and Technologies video driver
 Summary(pl):	Sterownik do kart na uk³adach Chips and Technologies
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-ChipsTechnologies
 
 %description driver-chips
@@ -839,8 +851,8 @@ Sterownik do kart na uk
 Summary:	Cirrus Logic video driver
 Summary(pl):	Sterownik do kart Cirrus Logic
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Cirrus
 
 %description driver-cirrus
@@ -853,8 +865,8 @@ Sterownik do kart Cirrus Logic.
 Summary:	Cyrix video driver
 Summary(pl):	Sterownik do grafiki na uk³adzie Cyrix MediaGX
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Cyrix
 
 %description driver-cyrix
@@ -867,8 +879,8 @@ Sterownik do grafiki na uk
 Summary:	Video driver for framebuffer device
 Summary(pl):	Sterownik korzystaj±cy z framebuffera
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-FBDev
 
 %description driver-fbdev
@@ -881,8 +893,8 @@ Nieakcelerowany sterownik korzystaj
 Summary:	Video driver for DRI sparc framebuffer device
 Summary(pl):	Sterownik do framebuffera DRI na sparc
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-ffb
 Video driver for DRI sparc framebuffer device.
@@ -894,8 +906,8 @@ Sterownik do framebuffera DRI na sparc.
 Summary:	3Dfx Voodoo1 and Voodoo2 video driver
 Summary(pl):	Sterownik do kart 3Dfx Voodoo1 i Voodoo2
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-glide
 Voodoo1 and Voodoo2 video driver.
@@ -908,8 +920,8 @@ Summary:	GLINT/Permedia video driver
 Summary(pl):	Sterownik do kart GLINT i Permedia
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-3DLabs
 
@@ -923,8 +935,8 @@ Sterownik do kart GLINT i Permedia.
 Summary:	Number 9 I128 video driver
 Summary(pl):	Sterownik do kart Number 9 I128
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-I128
 
 %description driver-i128
@@ -937,8 +949,8 @@ Sterownik do kart Number 9 I128.
 Summary:	Intel i740 video driver
 Summary(pl):	Sterownik do kart na uk³adzie Intel i740
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-i740
 
 %description driver-i740
@@ -952,8 +964,8 @@ Summary:	Intel i810/i815/i830 video driver
 Summary(pl):	Sterownik do grafiki na uk³adach Intel i810/i815/i830
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-i810
 
@@ -967,8 +979,8 @@ Sterownik do grafiki na uk
 Summary:	Integrated Micro Solutions Twin Turbo 128 driver
 Summary(pl):	Sterownik do kart Integrated Micro Solutions Twin Turbo 128
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-imstt
 Integrated Micro Solutions Twin Turbo 128 driver.
@@ -981,8 +993,8 @@ Summary:	Matrox video driver
 Summary(pl):	Sterownik do kart Matrox
 Group:		X11/XFree86
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-mga
 
@@ -996,8 +1008,8 @@ Sterownik do kart Matrox.
 Summary:	NeoMagic video driver
 Summary(pl):	Sterownik do kart NeoMagic
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-NeoMagic
 
 %description driver-neomagic
@@ -1010,8 +1022,8 @@ Sterownik do kart NeoMagic.
 Summary:	Newport (XL) adapters video driver
 Summary(pl):	Sterownik do kart Newport (XL)
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-newport
 Newport (XL) adapters video driver (found primarily in SGI Indy and
@@ -1025,8 +1037,8 @@ SGI Indy i Indigo).
 Summary:	National Semiconductors GEODE family video driver
 Summary(pl):	Sterownik dla kart na uk³adach z rodziny GEODE firmy National Semiconductors
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-nsc
 National Semiconductors GEODE family video driver. Supports GXLV (5530
@@ -1041,8 +1053,8 @@ SC1400 oraz GX2 (uk
 Summary:	nVidia video driver
 Summary(pl):	Sterownik do kart na uk³adach firmy nVidia
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-NVidia
 
 %description driver-nv
@@ -1055,8 +1067,8 @@ Sterownik do kart na uk
 Summary:	Rendition video driver
 Summary(pl):	Sterownik do kart Rendition
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Rendition
 
 %description driver-rendition
@@ -1069,8 +1081,8 @@ Sterownik do kart Verite firmowanych przez Rendition/Micron.
 Summary:	S3 ViRGE/Trio3D video driver
 Summary(pl):	Sterownik do kart na uk³adach S3 ViRGE i Trio3D
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-S3V
 
 %description driver-s3virge
@@ -1083,8 +1095,8 @@ Sterownik do kart na uk
 Summary:	S3 Trio video driver
 Summary(pl):	Sterownik do kart na uk³adach S3 Trio
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-S3
 
 %description driver-s3
@@ -1097,8 +1109,8 @@ Sterownik do kart na uk
 Summary:	S3 Savage video driver
 Summary(pl):	Sterownik do kart na uk³adach S3 Savage
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-savage
 S3 Savage video driver.
@@ -1110,8 +1122,8 @@ Sterownik do kart na uk
 Summary:	Silicon Motion video driver
 Summary(pl):	Sterownik do kart na uk³adach Silicon Motion
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-siliconmotion
 Silicon Motion video driver.
@@ -1123,8 +1135,8 @@ Sterownik do kart na uk
 Summary:	SiS video driver
 Summary(pl):	Sterownik do kart na uk³adach SiS
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-SiS
 
 %description driver-sis
@@ -1137,8 +1149,8 @@ Sterownik do kart na uk
 Summary:	sunbw2 - Sun BW2 video driver
 Summary(pl):	Sterownik do monochromatycznego framebuffera BW2 na Sunie
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-SunMono
 
 %description driver-sunbw2
@@ -1151,8 +1163,8 @@ Sterownik do monochromatycznego framebuffera BW2 na Sunie.
 Summary:	suncg14 - Sun CG14 video driver
 Summary(pl):	Sterownik do kolorowego framebuffera CG14 na Sunie
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-suncg14
 suncg14 - Sun CG14 video driver.
@@ -1164,8 +1176,8 @@ Sterownik do kolorowego framebuffera CG14 na Sunie.
 Summary:	suncg3 - Sun CG3 video cards driver
 Summary(pl):	Sterownik do kolorowego framebuffera CG3 na Sunie
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-suncg3
 suncg3 - Sun CG3 video cards driver.
@@ -1177,8 +1189,8 @@ Sterownik do kolorowego framebuffera CG3 na Sunie.
 Summary:	suncg6 - Sun GX and Turbo GX video driver
 Summary(pl):	Sterownik do grafiki GX i Turbo GX na Sunie
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-suncg6
 suncg6 - Sun GX and Turbo GX video driver.
@@ -1190,8 +1202,8 @@ Sterownik do grafiki GX i Turbo GX na Sunie.
 Summary:	sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver
 Summary(pl):	Sterownik do kart Sun Creator, Creator 3D, Elite 3D
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-sunffb
 sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
@@ -1203,8 +1215,8 @@ Sterownik do kart Sun Creator, Creator 3D, Elite 3D.
 Summary:	sunleo - Sun Leo (ZX) video cards driver
 Summary(pl):	Sterownik do kart Sun Leo (ZX)
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-sunleo
 sunleo - Sun Leo (ZX) video cards driver.
@@ -1216,8 +1228,8 @@ Sterownik do kart Sun Leo (ZX).
 Summary:	suntcx - Sun TCX video cards driver
 Summary(pl):	Sterownik do kart Sun TCX
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-suntcx
 suntcx - Sun TCX video cards driver.
@@ -1231,8 +1243,8 @@ Summary(pl):	Sterownik do kart 3Dfx
 Group:		X11/XFree86
 Requires:	Glide3-DRI
 Requires:	OpenGL
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-3dfx
 
@@ -1250,8 +1262,8 @@ a Glide_V5-DRI do kart Voodoo4 lub Voodoo5.
 Summary:	TGA video driver
 Summary(pl):	Sterownik do kart TGA
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-TGA
 
 %description driver-tga
@@ -1264,8 +1276,8 @@ Sterownik do kart TGA.
 Summary:	Trident video driver
 Summary(pl):	Sterownik do kart Trident
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Trident
 
 %description driver-trident
@@ -1278,8 +1290,8 @@ Sterownik do kart Trident.
 Summary:	Tseng Labs video driver
 Summary(pl):	Sterownik do kart Tseng Labs
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 Obsoletes:	XFree86-Tseng XFree86-W32
 
 %description driver-tseng
@@ -1292,8 +1304,8 @@ Sterownik do kart firmy Tseng Labs.
 Summary:	VIA CLE266 driver
 Summary(pl):	Sterownik do kart VIA CLE266
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-via
 VIA CLE266 driver.
@@ -1305,8 +1317,8 @@ Sterownik do kart VIA CLE266.
 Summary:	VMWare SVGA emulated video driver
 Summary(pl):	Sterownik do emulacji karty SVGA dostêpnej pod VMware
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	%{name}-modules = %{version}-%{release}
+Requires:	%{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires:	%{name}-modules = %{epoch}:%{version}-%{release}
 
 %description driver-vmware
 VMware emulated SVGA video driver. Necessary if you run Linux on
@@ -1329,7 +1341,7 @@ Group:		X11/XFree86
 Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	grep
 Requires(postun):	fileutils
-Requires:	%{name}-common = %{version}
+Requires:	%{name}-common = %{epoch}:%{version}
 Provides:	xpm
 Obsoletes:	xpm
 
@@ -1436,7 +1448,7 @@ Summary(pl):	Graficzny konfigurator dla XFree86
 Summary(ru):	õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
 Summary(uk):	õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
 Group:		X11/XFree86
-Requires:	%{name}-Xserver = %{version}
+Requires:	%{name}-Xserver = %{epoch}:%{version}
 Obsoletes:	XFree86-xf86cfg
 
 %description setup
@@ -1463,7 +1475,7 @@ Summary(pl):	Biblioteki statyczne X11R6
 Summary(ru):	óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
 Summary(uk):	óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
 Group:		X11/Development/Libraries
-Requires:	%{name}-devel = %{version}
+Requires:	%{name}-devel = %{epoch}:%{version}
 %ifarch sparc sparc64
 Obsoletes:	X11R6.1-devel
 %endif
@@ -1492,7 +1504,7 @@ Summary(ru):	
 Summary(uk):	ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
 Group:		X11/XFree86
 Requires:	%{name} >= %{version}
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Requires:	man-config
 Obsoletes:	X11R6-contrib
 
@@ -1602,7 +1614,7 @@ Summary(pl):	Twm - podstawowy zarz
 Summary(ru):	ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
 Summary(uk):	ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
 Group:		X11/Window Managers
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 
 %description -n twm
 Twm is a window manager for the X Window System. It provides
@@ -1626,7 +1638,7 @@ definiowalne przypisania klawiszy i przycisk
 Summary:	xauth - X authority file utility
 Summary(pl):	xauth - narzêdzie do plików X authority
 Group:		X11/XFree86
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 
 %description -n xauth
 The xauth program is used to edit and display the authorization
@@ -1650,11 +1662,11 @@ Summary(uk):	
 Group:		X11/XFree86
 PreReq:		rc-scripts
 Requires(post,preun):	/sbin/chkconfig
-Requires:	%{name} = %{version}
-Requires:	%{name}-libs = %{version}
+Requires:	%{name} = %{epoch}:%{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Requires:	/usr/X11R6/bin/sessreg
 Requires:	pam >= 0.71
-Requires:	sessreg = %{version}
+Requires:	sessreg = %{epoch}:%{version}
 Requires:	/usr/X11R6/bin/sessreg
 Provides:	XDM
 Obsoletes:	XFree86-xdm
@@ -1693,7 +1705,7 @@ Requires(post,preun):	/sbin/chkconfig
 Requires(postun):	/usr/sbin/groupdel
 Requires(postun):	/usr/sbin/userdel
 Requires:	%{name}-fonts-base
-Requires:	%{name}-libs = %{version}
+Requires:	%{name}-libs = %{epoch}:%{version}
 Obsoletes:	xfsft XFree86-xfs
 
 %description -n xfs
@@ -1758,7 +1770,7 @@ System. 
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p0
+%patch25 -p1
 %patch26 -p1
 %patch27 -p1
 %ifarch sparc sparc64
@@ -1783,6 +1795,8 @@ System. 
 %patch47 -p1
 tar xfz *.tar.gz
 %patch48 -p0
+%patch49 -p1
+%patch50 -p1
 
 rm -f xc/config/cf/host.def
 
@@ -1821,7 +1835,8 @@ rm -rf xc/fonts
 %ifarch %{ix86} mips ppc arm
 olddir=$(pwd)
 cd LinuxDriver/2D
-sed -i -e 's#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g' Imakefile
+chmod u+w Imakefile
+echo -e ',s#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g\n,w' | ed Imakefile
 xmkmf $olddir/xc .
 %{__make} -S savage_drv.o \
 	DEFAULT_OS_CPU_FROB=%{_target_cpu} \
@@ -1859,14 +1874,16 @@ done
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+	$RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
 	$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
 	$RPM_BUILD_ROOT%{_datadir}/misc \
 	$RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT/usr/{bin,include,lib} \
 	$RPM_BUILD_ROOT/var/{log,lib/xkb} \
 	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
-	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
+	$RPM_BUILD_ROOT%{_xsessdir}
 
 %{__make} -C xc	install	install.man \
 	DESTDIR="$RPM_BUILD_ROOT" \
@@ -1941,14 +1958,18 @@ install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
 
 install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
 install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
-	%{SOURCE26} %{SOURCE27} \
+	%{SOURCE26} %{SOURCE27} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
 	$RPM_BUILD_ROOT%{_desktopdir}
 install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
-	%{SOURCE35} %{SOURCE36} %{SOURCE37} \
+	%{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE46} %{SOURCE47} \
+	%{SOURCE48} \
 	$RPM_BUILD_ROOT%{_pixmapsdir}
 
 bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
 
+# twm desktop file for gdm/kdm support
+install %{SOURCE42} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
+
 :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
 :> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
@@ -2117,6 +2138,7 @@ fi
 %{_libdir}/X11/app-defaults/XCalc-color
 %{_libdir}/X11/app-defaults/XClipboard
 %{_libdir}/X11/app-defaults/XClock
+%{_libdir}/X11/app-defaults/XClock-color
 %{_libdir}/X11/app-defaults/XLoad
 %{_libdir}/X11/app-defaults/XLogo
 %{_libdir}/X11/app-defaults/XLogo-color
@@ -2393,6 +2415,8 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glxinfo
 %attr(755,root,root) %{_libdir}/libGLU.so.*.*
+# to be fixed: it contains unresolved symbols and would need -lXm
+#%attr(755,root,root) %{_libdir}/libGLw.so.*.*
 %attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
 %{_mandir}/man1/glxinfo.1*
 
@@ -2415,6 +2439,7 @@ fi
 %defattr(644,root,root,755)
 %attr(4755,root,root) %{_bindir}/Xwrapper
 %attr(755,root,root) %{_bindir}/XFree86
+%attr(755,root,root) %{_bindir}/getconfig*
 %attr(755,root,root) %{_sysconfdir}/X11/X
 %attr(755,root,root) %{_bindir}/X
 %{_mandir}/man1/XFree86.1*
@@ -2437,33 +2462,42 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
-%attr(755,root,root) %{_libdir}/libXfont*.so
-%attr(755,root,root) %{_libdir}/libI*.so
-%attr(755,root,root) %{_libdir}/libS*.so
-%attr(755,root,root) %{_libdir}/libx*.so
+%attr(755,root,root) %{_libdir}/libFS.so
+%attr(755,root,root) %{_libdir}/libI810XvMC.so
+%attr(755,root,root) %{_libdir}/libICE.so
+%attr(755,root,root) %{_libdir}/libSM.so
+%attr(755,root,root) %{_libdir}/libX11.so
+%attr(755,root,root) %{_libdir}/libXRes.so
+%attr(755,root,root) %{_libdir}/libXTrap.so
+%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXext.so
+%attr(755,root,root) %{_libdir}/libXfont.so
+%attr(755,root,root) %{_libdir}/libXfontcache.so
+%attr(755,root,root) %{_libdir}/libXi.so
+%attr(755,root,root) %{_libdir}/libXinerama.so
+%attr(755,root,root) %{_libdir}/libXmu.so
+%attr(755,root,root) %{_libdir}/libXmuu.so
+%attr(755,root,root) %{_libdir}/libXp.so
+%attr(755,root,root) %{_libdir}/libXpm.so
+%attr(755,root,root) %{_libdir}/libXrandr.so
+%attr(755,root,root) %{_libdir}/libXss.so
+%attr(755,root,root) %{_libdir}/libXt.so
+%attr(755,root,root) %{_libdir}/libXtst.so
 %attr(755,root,root) %{_libdir}/libXv.so
-%{_libdir}/libfntstubs.a
-%{_libdir}/libfontenc.a
-%{_libdir}/libFS.a
-%{_libdir}/libI810XvMC.a
-%{_libdir}/liboldX.a
+%attr(755,root,root) %{_libdir}/libXvMC.so
+%attr(755,root,root) %{_libdir}/libXxf86dga.so
+%attr(755,root,root) %{_libdir}/libXxf86misc.so
+%attr(755,root,root) %{_libdir}/libXxf86rush.so
+%attr(755,root,root) %{_libdir}/libXxf86vm.so
+%attr(755,root,root) %{_libdir}/libfontenc.so
+%attr(755,root,root) %{_libdir}/libxkbfile.so
+%attr(755,root,root) %{_libdir}/libxkbui.so
+%attr(755,root,root) %{_libdir}/libxrx.so
 %{_libdir}/libXau.a
 %{_libdir}/libXdmcp.a
+%{_libdir}/libfntstubs.a
+%{_libdir}/liboldX.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
 %{_includedir}/X11/*.h
 %{_includedir}/X11/ICE
 %{_includedir}/X11/PM
@@ -2471,10 +2505,7 @@ fi
 %{_includedir}/X11/Xaw
 %{_includedir}/X11/Xmu
 %dir %{_includedir}/X11/extensions
-%{_includedir}/X11/extensions/[^X]*.h
-%{_includedir}/X11/extensions/X[^I]*.h
-%{_includedir}/X11/extensions/XI.h
-%{_includedir}/X11/extensions/XI[^E]*.h
+%{_includedir}/X11/extensions/*.h
 %{_includedir}/X11/fonts
 %{_includedir}/xf86*.h
 %{_libdir}/X11/config
@@ -2482,10 +2513,8 @@ fi
 %exclude %{_includedir}/X11/extensions/Xrender.h
 %exclude %{_includedir}/X11/extensions/render.h
 %exclude %{_includedir}/X11/extensions/renderproto.h
-%exclude %{_libdir}/libXrender.so
-%exclude %{_libdir}/libXcursor.so
 
-%{_mandir}/man3/[A-EH-Z]*
+%{_mandir}/man3/[A-FH-Z]*
 %exclude %{_mandir}/man3/Xft.3*
 
 %files Xserver-devel
@@ -2620,7 +2649,7 @@ fi
 %endif
 
 # Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm
+%ifarch %{ix86} mips alpha arm ppc
 %files driver-nv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
@@ -2726,7 +2755,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
 %ifarch %{ix86}
-#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
 %endif
 %{_mandir}/man4/sis*
 %endif
@@ -2781,11 +2810,11 @@ fi
 %{_mandir}/man4/suntcx*
 %endif
 
-%ifarch %{ix86} sparc sparc64 mips alpha arm
+%ifarch %{ix86} sparc sparc64 mips alpha arm 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}
-%ifarch %{ix86} alpha arm
+%ifarch %{ix86} alpha arm ppc
 %{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
 %endif
 %{!?_without_tdfx:%{_mandir}/man4/tdfx*}
@@ -2830,6 +2859,7 @@ fi
 
 %files libs -f XFree86-libs.lang
 %defattr(644,root,root,755)
+%dir /etc/xdg
 %dir %{_themesdir}
 %dir %{_themesdir}/Default
 %dir %{_themesdir}/ThinIce
@@ -2861,15 +2891,38 @@ fi
 %dir %{_pixmapsdir}/mini
 %dir %{_soundsdir}
 %dir %{_wmpropsdir}
-%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so.*.*
-%attr(755,root,root) %{_libdir}/libXfont*.so.*.*
-%attr(755,root,root) %{_libdir}/libI*.so.*.*
-%attr(755,root,root) %{_libdir}/libS*.so.*.*
-%attr(755,root,root) %{_libdir}/libx*.so.*.*
+%dir %{_xsessdir}
+%attr(755,root,root) %{_libdir}/libFS.so.*.*
+%attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
+%attr(755,root,root) %{_libdir}/libICE.so.*.*
+%attr(755,root,root) %{_libdir}/libSM.so.*.*
+%attr(755,root,root) %{_libdir}/libX11.so.*.*
+%attr(755,root,root) %{_libdir}/libXRes.so.*.*
+%attr(755,root,root) %{_libdir}/libXTrap.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw.so.*.*
+%attr(755,root,root) %{_libdir}/libXext.so.*.*
+%attr(755,root,root) %{_libdir}/libXfont.so.*.*
+%attr(755,root,root) %{_libdir}/libXfontcache.so.*.*
+%attr(755,root,root) %{_libdir}/libXi.so.*.*
+%attr(755,root,root) %{_libdir}/libXinerama.so.*.*
+%attr(755,root,root) %{_libdir}/libXmu.so.*.*
+%attr(755,root,root) %{_libdir}/libXmuu.so.*.*
+%attr(755,root,root) %{_libdir}/libXp.so.*.*
+%attr(755,root,root) %{_libdir}/libXpm.so.*.*
+%attr(755,root,root) %{_libdir}/libXrandr.so.*.*
+%attr(755,root,root) %{_libdir}/libXss.so.*.*
+%attr(755,root,root) %{_libdir}/libXt.so.*.*
+%attr(755,root,root) %{_libdir}/libXtst.so.*.*
 %attr(755,root,root) %{_libdir}/libXv.so.*.*
-
-%exclude %{_libdir}/libXrender.so.*.*
-%exclude %{_libdir}/libXcursor.so.*.*
+%attr(755,root,root) %{_libdir}/libXvMC.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86dga.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86vm.so.*.*
+%attr(755,root,root) %{_libdir}/libfontenc.so.*.*
+%attr(755,root,root) %{_libdir}/libxkbfile.so.*.*
+%attr(755,root,root) %{_libdir}/libxkbui.so.*.*
+%attr(755,root,root) %{_libdir}/libxrx.so.*.*
 
 %files modules
 %defattr(644,root,root,755)
@@ -2948,20 +3001,36 @@ fi
 
 %files static
 %defattr(644,root,root,755)
+%{_libdir}/libFS.a
+%{_libdir}/libI810XvMC.a
 %{_libdir}/libICE.a
 %{_libdir}/libSM.a
 %{_libdir}/libX11.a
 %{_libdir}/libXRes.a
+%{_libdir}/libXTrap.a
 %{_libdir}/libXaw.a
 %{_libdir}/libXext.a
 %{_libdir}/libXfont.a
+%{_libdir}/libXfontcache.a
 %{_libdir}/libXi.a
+%{_libdir}/libXinerama.a
 %{_libdir}/libXmu.a
 %{_libdir}/libXmuu.a
 %{_libdir}/libXp.a
 %{_libdir}/libXpm.a
+%{_libdir}/libXrandr.a
+%{_libdir}/libXss.a
 %{_libdir}/libXt.a
 %{_libdir}/libXtst.a
+%{_libdir}/libXv.a
+%{_libdir}/libXvMC.a
+%{_libdir}/libXxf86dga.a
+%{_libdir}/libXxf86misc.a
+%{_libdir}/libXxf86rush.a
+%{_libdir}/libXxf86vm.a
+%{_libdir}/libfontenc.a
+%{_libdir}/libxkbfile.a
+%{_libdir}/libxkbui.a
 
 %files tools
 %defattr(644,root,root,755)
@@ -3054,15 +3123,21 @@ fi
 %{_libdir}/X11/app-defaults/Xditview-chrtr
 
 %{_desktopdir}/oclock.desktop
+%{_desktopdir}/xcalc.desktop
 %{_desktopdir}/xclipboard.desktop
 %{_desktopdir}/xclock.desktop
 %{_desktopdir}/xedit.desktop
 %{_desktopdir}/xeyes.desktop
+%{_desktopdir}/xload.desktop
+%{_desktopdir}/xmag.desktop
 %{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xcalc.png
 %{_pixmapsdir}/xclipboard.png
 %{_pixmapsdir}/xclock.png
 %{_pixmapsdir}/xedit.png
 %{_pixmapsdir}/xeyes.png
+%{_pixmapsdir}/xload.png
+%{_pixmapsdir}/xmag.png
 
 %files -n imake
 %defattr(644,root,root,755)
@@ -3088,6 +3163,7 @@ fi
 %files -n twm
 %defattr(644,root,root,755)
 %{_wmpropsdir}/twm.desktop
+%{_xsessdir}/twm.desktop
 %attr(755,root,root) %{_bindir}/twm
 %dir %{_sysconfdir}/X11/twm
 %config %{_sysconfdir}/X11/twm/system.twmrc