X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=27fafcf5ed88ba8eba0c1a74565e36b03c4dfba1;hb=8df9666470c9ea9db3c59e0fc76d4188989f7b71;hp=e7dcc5d8fa1ac652878b5674c7ab2061f16d7f26;hpb=cf56b81d34c2e2c333b3681e4e8c68b108d74325;p=packages%2FXFree86.git

diff --git a/XFree86.spec b/XFree86.spec
index e7dcc5d..27fafcf 100644
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -8,6 +8,7 @@
 #
 
 %define		_sver	%(echo %{version} | tr -d .)
+%define		_synaptics_ver	0.11.3p11
 
 Summary:	XFree86 Window System servers and basic programs
 Summary(de):	Xfree86 Window-System-Server und grundlegende Programme
@@ -22,14 +23,16 @@ Summary(ru):	
 Summary(uk):	âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):	XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:		XFree86
-Version:	4.3.99.4
-Release:	0.1
+Version:	4.3.99.11
+Release:	0.3
 License:	MIT
 Group:		X11/XFree86
 Source0:	ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
+# Source0-md5:	0aa6cbc6ee19d38f3ab916929f283ac7
 #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.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
+Source3:	ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
+# Source3-md5:	0a15b1c374256b5cad7961807baa3896
 Source4:	xdm.pamd
 Source5:	xserver.pamd
 Source6:	xdm.init
@@ -55,7 +58,13 @@ Source35:	xclock.png
 Source36:	oclock.png
 Source37:	xconsole.png
 Source38:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
-Source39:	cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+# 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:	4dabd4c8ce8968eba6cde1dd6265c9c7
+Source41:	http://www.linux.org.uk/~alan/S3.zip
+# Source41-md5:	8b754fc6bbded60b683563b945e384b0
 Patch0:		%{name}-PLD.patch
 Patch1:		%{name}-HasZlib.patch
 Patch2:		%{name}-DisableDebug.patch
@@ -81,7 +90,7 @@ Patch21:	%{name}-r128-busmstr2.patch
 Patch22:	%{name}-neomagic_swcursor.patch
 Patch23:	%{name}-mga-busmstr.patch
 Patch24:	%{name}-agpgart-load.patch
-Patch25:	%{name}-mkfontdir-chmod_644.patch
+Patch25:	%{name}-symbols.patch
 Patch26:	%{name}-HasFreetype2.patch
 Patch27:	%{name}-config-s3.patch
 Patch28:	%{name}-sparc_pci_domains.patch
@@ -92,7 +101,6 @@ Patch33:	%{name}-clearrts.patch
 Patch34:	%{name}-fix-07-s3trio64v2gx+netfinity.patch
 Patch35:	%{name}-i740-driver-update-cvs-20020617.patch
 Patch36:	%{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch37:	%{name}-tdfx-interlace.patch
 Patch38:	%{name}-tdfx-fix-compiler-warnings.patch
 Patch39:	%{name}-tdfx-fix-vtswitch-font-corruption.patch
 Patch40:	%{name}-Xfont-Type1-large-DoS.patch
@@ -102,26 +110,27 @@ Patch41:	%{name}-GLcore-strip-a-workaround.patch
 Patch42:	%{name}-disable_glide.patch
 Patch43:	%{name}-expat.patch
 Patch44:	%{name}-pkgconfig.patch
-Patch45:	%{name}-VidMode-nocrashafterfailure.patch
 # spencode.o in libspeedo.a is empty - patch like for libGLcore.a
-Patch46:	%{name}-spencode-nowarning.patch
+Patch45:	%{name}-spencode-nowarning.patch
 # Small (maybe buggy) patch to resolve problems with totem 0.97.0
-Patch47:	%{name}-lock.patch
-Patch48:	%{name}-savage-20030505.patch
+Patch46:	%{name}-lock.patch
+Patch47:	%{name}-linux-version.patch
+Patch48:	%{name}-new-s3-nodebug.patch
+Patch49:	%{name}-core_pointer.patch
+URL:		http://www.xfree86.org/
+BuildRequires:	%{_bindir}/perl
 BuildRequires:	bison
+BuildRequires:	ed
 BuildRequires:	expat-devel
 BuildRequires:	flex
 BuildRequires:	freetype-devel >= 2.0.0
-BuildRequires:	gcc-c++
 BuildRequires:	libpng-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	ncurses-devel
 BuildRequires:	pam-devel
-BuildRequires:	%{_bindir}/perl
 BuildRequires:	tcl-devel
 BuildRequires:	utempter-devel
 BuildRequires:	zlib-devel
-BuildRequires:	ed
 %ifarch %{ix86} alpha
 %{!?_without_tdfx:BuildRequires:	Glide3-DRI-devel}
 %endif
@@ -129,8 +138,8 @@ BuildRequires:	ed
 %ifarch %{ix86}
 %{!?_without_tdfx:BuildRequires:	Glide2x_SDK}
 %endif
-Requires:	xauth
 Requires:	%{name}-libs = %{version}
+Requires:	xauth
 ExclusiveArch:	%{ix86} alpha sparc m68k armv4l noarch ppc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	xpm-progs
@@ -153,9 +162,6 @@ Obsoletes:	X11R6.1
 %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,
-you'll need to install XFree86.
-
 The X Window System provides the base technology for developing
 graphical user interfaces. Simply stated, X draws the elements of the
 GUI on the user's screen and builds methods for sending user
@@ -298,8 +304,8 @@ X-Window Display PostScript to niezale
 wy¶wietlania informacji na ekranie.
 
 %package DPS-devel
-Summary:	Display PostScript
-Summary(pl):	Display PostScript
+Summary:	Header files for Display PostScript
+Summary(pl):	Pliki nag³ówkowe dla Display PostScript
 Group:		X11/XFree86
 Requires:	%{name}-DPS = %{version}
 Obsoletes:	dgs-devel
@@ -311,8 +317,8 @@ Header files for develop X-Window Display Postscript.
 Pliki nag³ówkowe biblioteki X-Window Display PostScript.
 
 %package DPS-static
-Summary:	Display PostScript
-Summary(pl):	Display PostScript
+Summary:	Display PostScript static libraries
+Summary(pl):	Biblioteki statyczne Display PostScript
 Group:		X11/XFree86
 Requires:	%{name}-DPS-devel = %{version}
 Obsoletes:	dgs-static
@@ -323,138 +329,6 @@ X-Window Display PostScript static libraries.
 %description DPS-static -l pl
 Statyczne biblioteki X-Window Display PostScript.
 
-%package xft1
-Summary:	Old version of font rendering library
-Summary(pl):	Stara wersja biblioteki wy¶wietlaj±cej fonty
-Group:		X11/XFree86
-Requires:	%{name}-libs = %{version}
-Obsoletes:	XFree86-xft < 4.2.99
-
-%description xft1
-Old version of font rendering library.
-
-%description xft1 -l pl
-Stara wersja biblioteki wy¶wietlaj±cej fonty.
-
-%package xft
-Summary:	X Font rendering library
-Summary(pl):	Biblioteka do renderowania fontów
-Group:		X11/XFree86
-Requires:	%{name}-libs = %{version}
-Requires:	%{name}-fontconfig = %{version}
-Provides:	Xft = 2.1-2
-Obsoletes:	XFree86-xft2
-Obsoletes:	Xft
-
-%description xft
-Xft is a font rendering library for X.
-
-%description xft -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-%package xft-devel
-Summary:	X Font Rendering library
-Summary(pl):	Biblioteka do renderowania fontów
-Group:		X11/Development/Libraries
-Requires:	%{name}-xft = %{version}
-Requires:	%{name}-fontconfig-devel
-Provides:	Xft-devel = 2.1-2
-Obsoletes:	XFree86-xft2-devel
-Obsoletes:	Xft-devel
-
-%description xft-devel
-Xft is a font rendering library for X.
-
-This package contains the header files needed to develop programs that
-use these Xft.
-
-%description xft-devel -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
-programów korzystaj±cych z biblioteki Xft.
-
-%package xft-static
-Summary:	X Font Rendering library
-Summary(pl):	Biblioteka do renderowania fontów
-Group:		X11/Development/Libraries
-Requires:	%{name}-xft-devel = %{version}
-Provides:	Xft-static = 2.1-2
-Obsoletes:	XFree86-xft2-static
-Obsoletes:	Xft-static
-
-%description xft-static
-Xft is a font rendering library for X.
-
-This package contains static libraries.
-
-%description xft-static -l pl
-Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-
-Ten pakiet zawiera biblioteki statyczne.
-
-%package fontconfig
-Summary:	Font configuration and customization library
-Summary(pl):	Biblioteka do konfigurowania fontów
-Requires:	%{name}-libs = %{version}
-Group:		Libraries
-Requires(post):	/sbin/ldconfig
-Provides:	fontconfig = 1.0.1
-Provides:	%{name}-fontconfig-realpkg = %{version}
-Obsoletes:	fontconfig
-
-%description fontconfig
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-%description fontconfig -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-%package fontconfig-devel
-Summary:	Font configuration and customization library
-Summary(pl):	Biblioteka do konfigurowania fontów
-Group:		Development/Libraries
-Requires:	%{name}-fontconfig-realpkg = %{version}
-Requires:	freetype-devel
-Provides:	fontconfig-devel = 1.0.1
-Provides:	%{name}-fontconfig-devel-realpkg = %{version}
-Obsoletes:	fontconfig-devel
-
-%description fontconfig-devel
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-This package contains the header files needed to develop programs that
-use these fontconfig.
-
-%description fontconfig-devel -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania
-programów korzystaj±cych z biblioteki fontconfig.
-
-%package fontconfig-static
-Summary:	Font configuration and customization library
-Summary(pl):	Biblioteka do konfigurowania fontów
-Group:		Development/Libraries
-Requires:	%{name}-fontconfig-devel-realpkg = %{version}
-Provides:	fontconfig-static = 1.0.1
-Obsoletes:	fontconfig-static
-
-%description fontconfig-static
-Fontconfig is designed to locate fonts within the system and select
-them according to requirements specified by applications.
-
-This package contains static libraries.
-
-%description fontconfig-static -l pl
-Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w
-systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji.
-
-Ten pakiet zawiera biblioteki statyczne.
-
 %package OpenGL-core
 Summary:	OpenGL support for X11R6
 Summary(pl):	Wsparcie OpenGL dla systemu X11R6
@@ -474,11 +348,11 @@ Summary(pl):	Pliki nag
 Group:		X11/Development/Libraries
 Requires:	%{name}-OpenGL-libs = %{version}
 Requires:	%{name}-devel
-Requires:       OpenGL-devel-base
+Requires:	OpenGL-devel-base
 Provides:	OpenGL-devel
 Obsoletes:	Mesa-devel
-Obsoletes:	glxMesa-devel
 Obsoletes:	XFree86-OpenGL-doc
+Obsoletes:	glxMesa-devel
 
 %description OpenGL-devel
 Headers and man pages for OpenGL for X11R6.
@@ -487,13 +361,13 @@ Headers and man pages for OpenGL for X11R6.
 Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
 
 %package OpenGL-devel-base
-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:       %{name}-OpenGL-libs = %{version}
-Requires:       %{name}-devel
-Provides:       OpenGL-devel-base
+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:	%{name}-OpenGL-libs = %{version}
+Requires:	%{name}-devel
 Requires:	OpenGL-devel
+Provides:	OpenGL-devel-base
 
 %description OpenGL-devel-base
 Base headers (only gl?.h) for OpenGL for X11R6.
@@ -501,13 +375,12 @@ Base headers (only gl?.h) for OpenGL for X11R6.
 %description OpenGL-devel-base -l pl
 Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6.
 
-
 %package OpenGL-libs
 Summary:	OpenGL libraries for X11R6
 Summary(pl):	Biblioteki OpenGL dla systemu X11R6
 Group:		X11/Libraries
-Requires:	%{name}-libs = %{version}
 Requires:	%{name}-OpenGL-core
+Requires:	%{name}-libs = %{version}
 Provides:	OpenGL
 Obsoletes:	%{name}-OpenGL
 Obsoletes:	Mesa
@@ -538,8 +411,8 @@ 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
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	XFree86-fonts-base
 
 %description Xnest
@@ -579,10 +452,10 @@ Xnest - 
 Summary:	X print server
 Summary(pl):	X serwer z rozszerzeniem Xprint
 Group:		X11/XFree86/Servers
-Requires:	%{name}-modules = %{version}-%{release}
+PreReq:		xprint-initrc
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	XFree86-fonts-base
-PreReq:		xprint-initrc
 
 %description Xprt
 Xprt provides an X server with the print extension and special DDX
@@ -598,10 +471,10 @@ Summary(fr):	Serveur XFree86
 Summary(pl):	Serwer XFree86
 Summary(tr):	XFree86 sunucusu
 Group:		X11/XFree86/Servers
-Requires:	pam
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	XFree86-fonts-base
+Requires:	pam
 Obsoletes:	XFree86-VGA16 XFree86-SVGA XFree86-Mono
 # obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
 Obsoletes:	XFree86-Sun XFree86-Sun24
@@ -655,8 +528,8 @@ 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
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	XFree86-fonts-base
 
 %description Xvfb
@@ -732,8 +605,8 @@ Summary(uk):	
 Group:		X11/Development/Libraries
 Requires:	%{name}-libs = %{version}
 Requires:	imake = %{version}
-Obsoletes:	xpm-devel
 Provides:	xpm-devel
+Obsoletes:	xpm-devel
 %ifarch sparc sparc64
 Obsoletes:	X11R6.1-devel
 %endif
@@ -788,12 +661,25 @@ XFree86-devel ͦ
 ÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
 ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
 
+%package Xserver-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}
+
+%description Xserver-devel
+Header files for XFree86 Xserver drivers and extensions development.
+
+%description Xserver-devel -l pl
+Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera
+XFree86.
+
 %package driver-apm
 Summary:	Alliance Promotion video driver
 Summary(pl):	Sterownik do kart Alliance Promotion
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Alliance
 
 %description driver-apm
@@ -806,8 +692,8 @@ Sterownik do kart Alliance Promotion.
 Summary:	Ark Logic video driver
 Summary(pl):	Sterownik do kart Ark Logic
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-ark
 Ark Logic driver.
@@ -819,8 +705,8 @@ Sterownik do kart Ark Logic.
 Summary:	ATI video driver
 Summary(pl):	Sterownik do kart ATI
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-ATI XFree86-Mach32 XFree86-Mach64
 
 %description driver-ati
@@ -833,8 +719,8 @@ Sterownik do kart ATI.
 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}-modules = %{version}-%{release}
 Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-Rage128
@@ -849,10 +735,10 @@ Sterownik do kart ATI Rage 128.
 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:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
+Requires:	XFree86-driver-ati
 Conflicts:	XFree86-driver-nvidia
 
 %description driver-radeon
@@ -865,13 +751,12 @@ Sterownik do kart ATI Radeon.
 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}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-ATI XFree86-Mach32 XFree86-Mach64
 
 %description driver-ati.2
-ATI video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
+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
@@ -881,8 +766,8 @@ Sterownik do kart ATI (ATI.2) projektu gatos
 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:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
 Requires:	XFree86-driver-ati.2
 Conflicts:	XFree86-driver-nvidia
@@ -900,10 +785,10 @@ Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
 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:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
+Requires:	XFree86-driver-ati.2
 Conflicts:	XFree86-driver-nvidia
 
 %description driver-radeon.2
@@ -918,8 +803,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-ChipsTechnologies
 
 %description driver-chips
@@ -932,8 +817,8 @@ Sterownik do kart na uk
 Summary:	Cirrus Logic video driver
 Summary(pl):	Sterownik do kart Cirrus Logic
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Cirrus
 
 %description driver-cirrus
@@ -946,8 +831,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Cyrix
 
 %description driver-cyrix
@@ -960,8 +845,8 @@ Sterownik do grafiki na uk
 Summary:	Video driver for framebuffer device
 Summary(pl):	Sterownik korzystaj±cy z framebuffera
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-FBDev
 
 %description driver-fbdev
@@ -974,8 +859,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-ffb
 Video driver for DRI sparc framebuffer device.
@@ -987,8 +872,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-glide
 Voodoo1 and Voodoo2 video driver.
@@ -1000,8 +885,8 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx.
 Summary:	GLINT/Permedia video driver
 Summary(pl):	Sterownik do kart GLINT i Permedia
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-3DLabs
@@ -1016,8 +901,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-I128
 
 %description driver-i128
@@ -1030,8 +915,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-i740
 
 %description driver-i740
@@ -1044,8 +929,8 @@ Sterownik do kart na uk
 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}
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-i810
@@ -1060,8 +945,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-imstt
 Integrated Micro Solutions Twin Turbo 128 driver.
@@ -1073,8 +958,8 @@ Sterownik do kart Integrated Micro Solutions Twin Turbo 128.
 Summary:	Matrox video driver
 Summary(pl):	Sterownik do kart Matrox
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-mga
@@ -1089,8 +974,8 @@ Sterownik do kart Matrox.
 Summary:	NeoMagic video driver
 Summary(pl):	Sterownik do kart NeoMagic
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-NeoMagic
 
 %description driver-neomagic
@@ -1103,8 +988,8 @@ Sterownik do kart NeoMagic.
 Summary:	Newport (XL) adapters video driver
 Summary(pl):	Sterownik do kart Newport (XL)
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-newport
 Newport (XL) adapters video driver (found primarily in SGI Indy and
@@ -1118,8 +1003,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-nsc
 National Semiconductors GEODE family video driver. Supports GXLV (5530
@@ -1134,8 +1019,8 @@ SC1400 oraz GX2 (uk
 Summary:	nVidia video driver
 Summary(pl):	Sterownik do kart na uk³adach firmy nVidia
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-NVidia
 
 %description driver-nv
@@ -1148,8 +1033,8 @@ Sterownik do kart na uk
 Summary:	Rendition video driver
 Summary(pl):	Sterownik do kart Rendition
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Rendition
 
 %description driver-rendition
@@ -1162,8 +1047,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-S3V
 
 %description driver-s3virge
@@ -1176,8 +1061,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-S3
 
 %description driver-s3
@@ -1190,8 +1075,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-savage
 S3 Savage video driver.
@@ -1203,8 +1088,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-siliconmotion
 Silicon Motion video driver.
@@ -1216,8 +1101,8 @@ Sterownik do kart na uk
 Summary:	SiS video driver
 Summary(pl):	Sterownik do kart na uk³adach SiS
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-SiS
 
 %description driver-sis
@@ -1230,8 +1115,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-SunMono
 
 %description driver-sunbw2
@@ -1244,8 +1129,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-suncg14
 suncg14 - Sun CG14 video driver.
@@ -1257,8 +1142,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-suncg3
 suncg3 - Sun CG3 video cards driver.
@@ -1270,8 +1155,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-suncg6
 suncg6 - Sun GX and Turbo GX video driver.
@@ -1283,8 +1168,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-sunffb
 sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
@@ -1296,8 +1181,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-sunleo
 sunleo - Sun Leo (ZX) video cards driver.
@@ -1309,8 +1194,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-suntcx
 suntcx - Sun TCX video cards driver.
@@ -1322,10 +1207,10 @@ Sterownik do kart Sun TCX.
 Summary:	3Dfx video driver
 Summary(pl):	Sterownik do kart 3Dfx
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
-Requires:	OpenGL
+Requires:	%{name}-modules = %{version}-%{release}
 Requires:	Glide3-DRI
+Requires:	OpenGL
 Conflicts:	XFree86-driver-nvidia
 Obsoletes:	XFree86-3dfx
 
@@ -1343,8 +1228,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-TGA
 
 %description driver-tga
@@ -1357,8 +1242,8 @@ Sterownik do kart TGA.
 Summary:	Trident video driver
 Summary(pl):	Sterownik do kart Trident
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Trident
 
 %description driver-trident
@@ -1371,8 +1256,8 @@ Sterownik do kart Trident.
 Summary:	Tseng Labs video driver
 Summary(pl):	Sterownik do kart Tseng Labs
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 Obsoletes:	XFree86-Tseng XFree86-W32
 
 %description driver-tseng
@@ -1385,8 +1270,8 @@ Sterownik do kart firmy Tseng Labs.
 Summary:	VIA CLE266 driver
 Summary(pl):	Sterownik do kart VIA CLE266
 Group:		X11/XFree86
-Requires:	%{name}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-via
 VIA CLE266 driver.
@@ -1398,8 +1283,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}-modules = %{version}-%{release}
 Requires:	%{name}-Xserver = %{version}-%{release}
+Requires:	%{name}-modules = %{version}-%{release}
 
 %description driver-vmware
 VMware emulated SVGA video driver. Necessary if you run Linux on
@@ -1423,8 +1308,8 @@ Requires(post,postun):	/sbin/ldconfig
 Requires(post,postun):	grep
 Requires(postun):	fileutils
 Requires:	%{name}-common = %{version}
-Obsoletes:	xpm
 Provides:	xpm
+Obsoletes:	xpm
 
 %ifarch sparc sparc64
 Obsoletes:	X11R6.1-libs
@@ -1741,13 +1626,15 @@ Summary(pl):	XDM - zarz
 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:	/usr/X11R6/bin/sessreg
+Requires:	pam >= 0.71
 Requires:	sessreg = %{version}
 Requires:	/usr/X11R6/bin/sessreg
 Provides:	XDM
-PreReq:		chkconfig
 Obsoletes:	XFree86-xdm
 Obsoletes:	gdm
 Obsoletes:	kdm
@@ -1775,15 +1662,16 @@ Summary(pl):	Serwer font
 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
+Requires:	%{name}-libs = %{version}
+Requires:	XFree86-fonts-base
 Obsoletes:	xfsft XFree86-xfs
 
 %description -n xfs
@@ -1821,7 +1709,7 @@ System. 
 #--- %prep ---------------------------
 
 %prep
-%setup -q -c -b3
+%setup -q -c -b3 -a40 -a41
 #-b1 -b2 -a3
 %patch0 -p0
 %patch1 -p1
@@ -1833,7 +1721,7 @@ System. 
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
-%patch10 -p1
+%patch10 -p0
 #%patch11 -p0	-- obsoleted???
 %patch12 -p1
 %patch13 -p1
@@ -1848,7 +1736,7 @@ System. 
 %patch22 -p1
 %patch23 -p1
 %patch24 -p1
-%patch25 -p1
+%patch25 -p0
 %patch26 -p1
 %patch27 -p1
 %ifarch sparc sparc64
@@ -1861,7 +1749,6 @@ System. 
 #%patch34 -p1	-- seems not applied (was partially in rc1??? maybe another fix present?)
 #%patch35 -p1	-- obsoleted? (but doesn't look to be applied)
 %{!?_without_tdfx:%patch36 -p0}
-%{!?_without_tdfx:%patch37 -p1}
 #%patch38 -p0	-- causing problems IIRC (but not really needed)
 %{!?_without_tdfx:%patch39 -p0}
 %patch40 -p1
@@ -1870,12 +1757,18 @@ System. 
 %patch43 -p0
 %patch44 -p0
 %patch45 -p1
-%patch46 -p1
-%patch47 -p0
-#%patch48 -p1	-- seems applied
+%patch46 -p0
+%patch47 -p1
+tar xfz *.tar.gz
+%patch48 -p0
+%patch49 -p0
 
 rm -f xc/config/cf/host.def
 
+#Remove fonts dir for faster build
+# only valid for snapshots
+rm -rf xc/fonts
+
 # New ATI drivers
 # cd xc/programs/Xserver/hw/xfree86/drivers
 #%bzcat %{SOURCE39} | tar x
@@ -1884,12 +1777,16 @@ rm -f xc/config/cf/host.def
 #--- %build --------------------------
 
 %build
-%{__make} -S -C xc World DEFAULT_OS_CPU_FROB=%{_target_cpu} \
-	"BOOTSTRAPCFLAGS=%{rpmcflags}" \
-	"CCOPTIONS=%{rpmcflags}" \
-	"CXXOPTIONS=%{rpmcflags}" \
-	"CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
-	"ICONDIR=%{_icondir}"
+%{__make} -S -C xc World \
+	DEFAULT_OS_CPU_FROB=%{_target_cpu} \
+	CC="%{__cc}" \
+	BOOTSTRAPCFLAGS="%{rpmcflags}" \
+	CCOPTIONS="%{rpmcflags}" \
+	CXXOPTIONS="%{rpmcflags}" \
+	CXXDEBUGFLAGS="" \
+	CDEBUGFLAGS="" \
+	ICONDIR="%{_icondir}" \
+	LINUXDIR="%{_kernelsrcdir}"
 
 %ifnarch alpha
 #%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
@@ -1900,6 +1797,43 @@ rm -f xc/config/cf/host.def
 #	"CXXDEBUGFLAGS=" "CDEBUGFLAGS="
 %endif
 
+%ifarch %{ix86} mips ppc arm
+olddir=$(pwd)
+cd LinuxDriver/2D
+sed -i -e 's#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g' Imakefile
+xmkmf $olddir/xc .
+%{__make} -S savage_drv.o \
+	DEFAULT_OS_CPU_FROB=%{_target_cpu} \
+	CC="%{__cc}" \
+	BOOTSTRAPCFLAGS="%{rpmcflags}" \
+	CCOPTIONS="%{rpmcflags}" \
+	CXXOPTIONS="%{rpmcflags}" \
+	CXXDEBUGFLAGS="" \
+	CDEBUGFLAGS="" \
+	ICONDIR="%{_icondir}" \
+	LINUXDIR="%{_kernelsrcdir}"
+cd $olddir
+%endif
+
+%ifnarch sparc sparc64
+TOPDIR=$(pwd)/xc
+%{__make} -S -C synaptics clean all \
+	TOP="$TOPDIR" \
+	CC="%{__cc}" \
+	BOOTSTRAPCFLAGS="%{rpmcflags}" \
+	CCOPTIONS="%{rpmcflags}" \
+	CXXOPTIONS="%{rpmcflags}" \
+	CXXDEBUGFLAGS="" \
+	CDEBUGFLAGS="" \
+	ICONDIR="%{_icondir}" \
+	LINUXDIR="%{_kernelsrcdir}"
+
+cd synaptics
+for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do
+	cp -f ${f} ${f}.synaptics
+done
+%endif
+
 #--- %install ------------------------
 
 %install
@@ -1910,20 +1844,26 @@ install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,s
 	$RPM_BUILD_ROOT%{_sbindir} \
 	$RPM_BUILD_ROOT/usr/{bin,include,lib} \
 	$RPM_BUILD_ROOT/var/{log,lib/xkb} \
-	$RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
-	$RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
-
-%{__make} -C xc	"DESTDIR=$RPM_BUILD_ROOT" \
-		"DOCDIR=/usr/share/doc/%{name}-%{version}" \
-		"INSTBINFLAGS=-m 755" \
-		"INSTPGMFLAGS=-m 755" \
-		"RAWCPP=/lib/cpp" \
-		"BOOTSTRAPCFLAGS=%{rpmcflags}" \
-		"CCOPTIONS=%{rpmcflags}" \
-		"CXXOPTIONS=%{rpmcflags}" \
-		"CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
-		"ICONDIR=%{_icondir}" \
-		install install.man
+	$RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}/mini} \
+	$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+
+%{__make} -C xc	install	install.man \
+	DESTDIR="$RPM_BUILD_ROOT" \
+	DOCDIR="/usr/share/doc/%{name}-%{version}" \
+	INSTBINFLAGS="-m 755" \
+	INSTPGMFLAGS="-m 755" \
+	RAWCPP="/lib/cpp" \
+	BOOTSTRAPCFLAGS="%{rpmcflags}" \
+	CCOPTIONS="%{rpmcflags}" \
+	CXXOPTIONS="%{rpmcflags}" \
+	CXXDEBUGFLAGS="" \
+	CDEBUGFLAGS="" \
+	ICONDIR="%{_icondir}" \
+	LINUXDIR="%{_kernelsrcdir}"
+
+%ifnarch sparc sparc64
+install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input
+%endif
 
 %ifnarch alpha
 #install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
@@ -1931,7 +1871,11 @@ install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,s
 #	$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
 
+%ifarch %{ix86} mips ppc arm
+install -d $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
+install LinuxDriver/2D/savage_drv.o $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers
 %endif
 
 # setting default X
@@ -1951,6 +1895,14 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so
 ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
 ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
 
+# collect Xserver headers
+install -d $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+cd xc/programs/Xserver
+# don't change to single install - there are symlinked "duplicates"
+install include/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+install hw/xfree86/{common,os-support}/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+cd -
+
 # 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
@@ -1967,14 +1919,11 @@ 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%{_pixmapsdir}
-install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
-	%{SOURCE36} %{SOURCE37} \
+install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
+	%{SOURCE26} %{SOURCE27} \
+	$RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
+	%{SOURCE35} %{SOURCE36} %{SOURCE37} \
 	$RPM_BUILD_ROOT%{_pixmapsdir}
 
 bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
@@ -2001,15 +1950,23 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
 # resolve conflict with man-pages
 mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
 
+# fix mkfontscale path
+perl -pi -e "s#mkfontscale#%{_bindir}/mkfontscale#g" $RPM_BUILD_ROOT%{_bindir}/mkfontdir
+
 # directories for applications locales
 echo '%defattr(644,root,root,755)' > XFree86-libs.lang
 for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \
 	fr ga gl he hr hu is it ja ko lt mi mk nl nn no pl pt pt_BR ro ru sk \
-	sl sr sv ta th tr uk wa zh_CN zh_CN.GB2312 zh_TW.Big5 ; do
+	sl sr sv ta th tr uk wa zh_CN zh_TW ; do
 	install -d $RPM_BUILD_ROOT%{_datadir}/locale/${lang}/LC_MESSAGES
 	echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang
 done
 
+%ifnarch sparc sparc64
+install synaptics/synclient   $RPM_BUILD_ROOT%{_bindir}
+install synaptics/*.synaptics $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}
+%endif
+
 %ifnarch sparc sparc64
 gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
 
@@ -2022,26 +1979,14 @@ rm -rf $RPM_BUILD_ROOT
 
 #--- %post{un}, %preun, %verifyscript, %trigge ----------
 
-%post	DPS -p /sbin/ldconfig
-%postun	DPS -p /sbin/ldconfig
-
-%post	xft1 -p /sbin/ldconfig
-%postun	xft1 -p /sbin/ldconfig
-
-%post   xft -p /sbin/ldconfig
-%postun xft -p /sbin/ldconfig
-
-%post	fontconfig
-/sbin/ldconfig
-HOME=/root %{_bindir}/fc-cache -f 2>/dev/null
-
-%postun	fontconfig -p /sbin/ldconfig
+%post   DPS -p /sbin/ldconfig
+%postun DPS -p /sbin/ldconfig
 
-%post	OpenGL-core -p /sbin/ldconfig
-%postun	OpenGL-core -p /sbin/ldconfig
+%post   OpenGL-core -p /sbin/ldconfig
+%postun OpenGL-core -p /sbin/ldconfig
 
-%post	OpenGL-libs -p /sbin/ldconfig
-%postun	OpenGL-libs -p /sbin/ldconfig
+%post   OpenGL-libs -p /sbin/ldconfig
+%postun OpenGL-libs -p /sbin/ldconfig
 
 %post libs
 umask 022
@@ -2066,6 +2011,11 @@ else
 	echo "found"
 fi
 
+%pre modules
+if [ -d /etc/X11/xkb/geometry/hp ]; then
+	rm -rf /etc/X11/xkb/geometry/hp
+fi
+
 %triggerpostun modules -- XFree86-modules < 4.0.2
 if [ -d /usr/X11R6/lib/X11/xkb ]; then
 	rm -rf /usr/X11R6/lib/X11/xkb
@@ -2199,8 +2149,6 @@ fi
 %attr(755,root,root) %{_bindir}/makestrs
 %attr(755,root,root) %{_bindir}/mergelib
 %attr(755,root,root) %{_bindir}/mkdirhier
-%attr(755,root,root) %{_bindir}/mkfontdir
-%attr(755,root,root) %{_bindir}/mkfontscale
 %attr(755,root,root) %{_bindir}/mkhtmlindex
 %attr(755,root,root) %{_bindir}/proxymngr
 %attr(755,root,root) %{_bindir}/resize
@@ -2212,6 +2160,9 @@ fi
 %attr(755,root,root) %{_bindir}/smproxy
 %attr(755,root,root) %{_bindir}/startx
 %attr(755,root,root) %{_bindir}/sxpm
+%ifnarch sparc sparc64
+%attr(755,root,root) %{_bindir}/synclient
+%endif
 %attr(755,root,root) %{_bindir}/uxterm
 %attr(755,root,root) %{_bindir}/xcmsdb
 %attr(755,root,root) %{_bindir}/xconsole
@@ -2252,10 +2203,13 @@ fi
 %{_includedir}/X11/bitmaps
 %{_includedir}/X11/pixmaps
 
-%{_applnkdir}/Utilities/xconsole.desktop
-%{_applnkdir}/Terminals/*
+%{_desktopdir}/xconsole.desktop
+%{_desktopdir}/xterm.desktop
+%{_pixmapsdir}/xconsole.png
+%{_pixmapsdir}/xlogo64.png
+%{_pixmapsdir}/xterm.png
+
 %{_libdir}/X11/app-defaults/Xvidtune
-%{_pixmapsdir}/x*
 
 %{_mandir}/man1/Xmark.1*
 %{_mandir}/man1/appres.1*
@@ -2276,8 +2230,6 @@ fi
 %{_mandir}/man1/makeg.1*
 %{_mandir}/man1/mergelib.1*
 %{_mandir}/man1/mkdirhier.1*
-%{_mandir}/man1/mkfontdir.1*
-%{_mandir}/man1/mkfontscale.1*
 %{_mandir}/man1/mkhtmlindex.1*
 %{_mandir}/man1/proxymngr.1*
 %{_mandir}/man1/resize.1*
@@ -2335,6 +2287,14 @@ fi
 %lang(pl) %{_mandir}/pl/man1/xinit.1*
 %lang(pl) %{_mandir}/pl/man1/xwd.1*
 
+# to be separated
+%attr(755,root,root) %{_bindir}/fonttosfnt
+%attr(755,root,root) %{_bindir}/mkfontdir
+%attr(755,root,root) %{_bindir}/mkfontscale
+%{_mandir}/man1/fonttosfnt.1*
+%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+
 %files common
 %defattr(644,root,root,755)
 /usr/bin/X11
@@ -2371,52 +2331,12 @@ fi
 %{_libdir}/libdpstk.a
 %{_libdir}/libpsres.a
 
-%files xft1
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so.1.1
-
-%files xft
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so.2.1
-
-%files xft-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xft-config
-%{_includedir}/X11/Xft
-%{_libdir}/libXft.so
-%{_mandir}/man3/Xft.3*
-%{_pkgconfigdir}/xft.pc
-
-%files xft-static
-%defattr(644,root,root,755)
-%{_libdir}/libXft.a
-
-%files fontconfig
-%defattr(644,root,root,755)
-%dir %{_sysconfdir}/fonts
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/fonts.conf
-%{_sysconfdir}/fonts/fonts.dtd
-%attr(755,root,root) %{_bindir}/fc-*
-%attr(755,root,root) %{_libdir}/libfontconfig.so.1.0
-%{_mandir}/man1/fc-*.1*
-
-%files fontconfig-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/fontconfig-config
-%{_includedir}/fontconfig
-%{_libdir}/libfontconfig.so
-%{_pkgconfigdir}/fontconfig.pc
-%{_mandir}/man3/fontconfig.3*
-
-%files fontconfig-static
-%defattr(644,root,root,755)
-%{_libdir}/libfontconfig.a
-
 %files OpenGL-core
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/glxgears
 %attr(755,root,root) %{_libdir}/libGL.so.*.*
 %attr(755,root,root) %{_libdir}/libGL.so
+%attr(755,root,root) /usr/lib/libGL.so*
 %attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
 %attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
 %{_mandir}/man1/glxgears.1x*
@@ -2427,6 +2347,7 @@ fi
 %attr(755,root,root) %{_libdir}/libOSMesa*.so
 %{_libdir}/libGLw.a
 %dir %{_includedir}/GL
+%dir /usr/include/GL
 %attr(644,root,root) %{_includedir}/GL/*
 %exclude %{_includedir}/GL/gl.h
 %exclude %{_includedir}/GL/glx.h
@@ -2489,7 +2410,6 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_bindir}/xcursor-config
 %attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
 %attr(755,root,root) %{_libdir}/libXfont*.so
 %attr(755,root,root) %{_libdir}/libI*.so
@@ -2502,7 +2422,6 @@ fi
 %{_libdir}/libI810XvMC.a
 %{_libdir}/liboldX.a
 %{_libdir}/libXau.a
-%{_libdir}/libXcursor.a
 %{_libdir}/libXdmcp.a
 %{_libdir}/libxf86config.a
 %{_libdir}/libXfontcache.a
@@ -2518,7 +2437,7 @@ fi
 %{_libdir}/libXxf86misc.a
 %{_libdir}/libXxf86rush.a
 %{_libdir}/libXxf86vm.a
-%{_includedir}/X11/*.h 
+%{_includedir}/X11/*.h
 %{_includedir}/X11/ICE
 %{_includedir}/X11/PM
 %{_includedir}/X11/SM
@@ -2530,14 +2449,22 @@ fi
 %{_includedir}/X11/extensions/XI.h
 %{_includedir}/X11/extensions/XI[^E]*.h
 %{_includedir}/X11/fonts
-%{_includedir}/X11/Xcursor
 %{_includedir}/xf86*.h
 %{_libdir}/X11/config
-%{_pkgconfigdir}/xcursor.pc
+
+%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]*
 %exclude %{_mandir}/man3/Xft.3*
 
+%files Xserver-devel
+%defattr(644,root,root,755)
+%{_includedir}/X11/Xserver
+
 # Devel: sparc sparc64
 %ifarch %{ix86}
 %files driver-apm
@@ -2750,6 +2677,11 @@ fi
 %files driver-savage
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
+%ifarch %{ix86} mips ppc arm
+%dir %{_libdir}/modules.s3
+%dir %{_libdir}/modules.s3/drivers
+%attr(755,root,root) %{_libdir}/modules.s3/drivers/savage_drv.o
+%endif
 %{_mandir}/man4/savage*
 %endif
 
@@ -2857,6 +2789,7 @@ fi
 %files driver-via
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%{_mandir}/man4/via.4*
 %endif
 
 # Devel: sparc sparc64
@@ -2907,6 +2840,9 @@ fi
 %attr(755,root,root) %{_libdir}/libx*.so.*.*
 %attr(755,root,root) %{_libdir}/libXv.so.*.*
 
+%exclude %{_libdir}/libXrender.so.*.*
+%exclude %{_libdir}/libXcursor.so.*.*
+
 %files modules
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/xkbcomp
@@ -2996,7 +2932,6 @@ fi
 %{_libdir}/libXmuu.a
 %{_libdir}/libXp.a
 %{_libdir}/libXpm.a
-%{_libdir}/libXrender.a
 %{_libdir}/libXt.a
 %{_libdir}/libXtst.a
 
@@ -3090,12 +3025,16 @@ fi
 %{_libdir}/X11/app-defaults/Xditview
 %{_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
-%{_pixmapsdir}/oclock*
+%{_desktopdir}/oclock.desktop
+%{_desktopdir}/xclipboard.desktop
+%{_desktopdir}/xclock.desktop
+%{_desktopdir}/xedit.desktop
+%{_desktopdir}/xeyes.desktop
+%{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xclipboard.png
+%{_pixmapsdir}/xclock.png
+%{_pixmapsdir}/xedit.png
+%{_pixmapsdir}/xeyes.png
 
 %files -n imake
 %defattr(644,root,root,755)
@@ -3176,11 +3115,9 @@ fi
 %attr(755,root,root) %{_bindir}/fstobdf
 %attr(755,root,root) %{_bindir}/mkcfm
 %attr(755,root,root) %{_bindir}/xfsinfo
-#%attr(755,root,root) %{_bindir}/xftcache
 
 %{_mandir}/man1/xfs.1*
 %{_mandir}/man1/fslsfonts.1*
 %{_mandir}/man1/fstobdf.1*
 %{_mandir}/man1/mkcfm.1*
 %{_mandir}/man1/xfsinfo.1*
-#%%{_mandir}/man1/xftcache.1*