- moved xkbcomp(1) manual to -modules as well; release 2.3

[packages/XFree86.git] / XFree86.spec

diff --git a/XFree86.spec b/XFree86.spec
index e68382124781acac6ec791908f7f4d189e78d826..4315f7cf03c7cdeee4d40e415949de5baadf5b6a 100644 (file)
--- a/XFree86.spec
+++ b/XFree86.spec
@@ -10,15 +10,9 @@ Summary(tr): XFree86 Pencereleme Sistemi sunucular
 Summary(pt_BR):        Programas básicos e servidores para o sistema de janelas XFree86
 Name:          XFree86
 Version:       4.2.0
-Release:       1
+Release:       2.3
 License:       MIT
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(es):     X11/XFree86
-Group(fr):     X11/XFree86
-Group(pl):     X11/XFree86
-Group(pt_BR):  X11/XFree86
-Group(tr):     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
@@ -35,6 +29,7 @@ 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
 Patch0:                %{name}-PLD.patch
 Patch1:                %{name}-HasZlib.patch
 Patch2:                %{name}-DisableDebug.patch
@@ -69,6 +64,7 @@ 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}-ati.old-rename.patch
 BuildRequires: bison
 BuildRequires: flex
 BuildRequires: freetype-devel >= 2.0.0
@@ -79,6 +75,7 @@ BuildRequires:        perl
 BuildRequires: tcl-devel
 BuildRequires: utempter-devel
 BuildRequires: zlib-devel
+BuildRequires: libstdc++-devel
 %ifarch %{ix86} alpha
 BuildRequires: Glide3-DRI-devel
 %endif
@@ -89,7 +86,7 @@ BuildRequires:        Glide2x_SDK
 Requires:      xauth
 Requires:      %{name}-libs = %{version}
 Requires:      %{name}-common = %{version}
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch
+ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:     xpm-progs
 Obsoletes:     xterm
@@ -186,8 +183,6 @@ seu hardware de v
 Summary:       XFree86 files required both on server and client side
 Summary(pl):   Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 
 %description common
 XFree86 files required both on server and client side.
@@ -199,8 +194,6 @@ Pliki XFree86 wymagane zar
 Summary:       Display PostScript
 Summary(pl):   Display PostScript
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Provides:      DPS
 Obsoletes:     dgs
 
@@ -216,8 +209,6 @@ wy
 Summary:       Display PostScript
 Summary(pl):   Display PostScript
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-DPS = %{version}
 Obsoletes:     dgs-devel
 
@@ -231,8 +222,6 @@ Pliki nag
 Summary:       Display PostScript
 Summary(pl):   Display PostScript
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-DPS-devel = %{version}
 Obsoletes:     dgs-static
 
@@ -246,8 +235,6 @@ Statyczne biblioteki X-Window Display PostScript.
 Summary:       PEX extension library
 Summary(pl):   Biblioteka rozszerzenia PEX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-libs = %{version}
 
 %description PEX
@@ -262,8 +249,6 @@ do
 Summary:       PEX extension headers
 Summary(pl):   Pliki nag³ówkowe rozszerzenia PEX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-PEX = %{version}
 
 %description PEX-devel
@@ -276,8 +261,6 @@ Pliki nag
 Summary:       PEX extension static library
 Summary(pl):   Statyczna biblioteka rozszerzenia PEX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-PEX-devel = %{version}
 
 %description PEX-static
@@ -290,8 +273,6 @@ Statyczna biblioteka rozszerzenia PEX.
 Summary:       XIE extension library
 Summary(pl):   Biblioteka rozszerzenia XIE
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-libs = %{version}
 
 %description XIE
@@ -306,8 +287,6 @@ Biblioteka rozszerzenia XIE (X Image Extension). Od wersji XFree86
 Summary:       XIE extension headers
 Summary(pl):   Pliki nag³ówkowe rozszerzenia XIE
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-XIE = %{version}
 
 %description XIE-devel
@@ -320,8 +299,6 @@ Pliki nag
 Summary:       XIE extension static library
 Summary(pl):   Statyczna biblioteka rozszerzenia XIE
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-XIE-devel = %{version}
 
 %description XIE-static
@@ -334,13 +311,6 @@ Statyczna biblioteka rozszerzenia XIE.
 Summary:       OpenGL support for X11R6
 Summary(pl):   Wsparcie OpenGL dla systemu X11R6
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-libs = %{version}
 
 %description OpenGL-core
@@ -353,13 +323,6 @@ Wsparcie OpenGL dla systemu X11R6.
 Summary:       OpenGL for X11R6 development
 Summary(pl):   Pliki nag³ówkowe OpenGL dla systemu X11R6
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-OpenGL-libs = %{version}
 Requires:      %{name}-devel
 Provides:      OpenGL-devel
@@ -377,13 +340,6 @@ Pliki nag
 Summary:       OpenGL libraries for X11R6
 Summary(pl):   Biblioteki OpenGL dla systemu X11R6
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-libs = %{version}
 Requires:      %{name}-OpenGL-core
 Provides:      OpenGL
@@ -400,13 +356,6 @@ Biblioteki OpenGL dla systemu X11R6.
 Summary:       X11R6 static libraries with OpenGL
 Summary(pl):   Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-OpenGL-devel = %{version}
 Provides:      OpenGL-static
 Obsoletes:     Mesa-static
@@ -421,8 +370,6 @@ Biblioteki statyczne zawieraj
 Summary:       XFree86 Xnest server
 Summary(pl):   Serwer XFree86 Xnest
 Group:         X11/XFree86/Servers
-Group(de):     X11/XFree86/Server
-Group(pl):     X11/XFree86/Serwery
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      XFree86-fonts-base
@@ -445,8 +392,6 @@ X serwer dla w
 Summary:       X print server
 Summary(pl):   X serwer z rozszerzeniem Xprint
 Group:         X11/XFree86/Servers
-Group(de):     X11/XFree86/Server
-Group(pl):     X11/XFree86/Serwery
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      XFree86-fonts-base
@@ -465,8 +410,6 @@ Summary(fr):        Serveur XFree86
 Summary(pl):   Serwer XFree86
 Summary(tr):   XFree86 sunucusu
 Group:         X11/XFree86/Servers
-Group(de):     X11/XFree86/Server
-Group(pl):     X11/XFree86/Serwery
 Requires:      pam
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
@@ -522,8 +465,6 @@ sunucuyu deneyin.
 Summary:       XFree86 Xvfb server
 Summary(pl):   Serwer XFree86 Xvfb
 Group:         X11/XFree86/Servers
-Group(de):     X11/XFree86/Server
-Group(pl):     X11/XFree86/Serwery
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-common /usr/X11R6/lib/X11/rgb.txt
 Requires:      XFree86-fonts-base
@@ -561,13 +502,6 @@ Summary(fr):       Pages man de programmation
 Summary(pl):   Pliki nag³ówkowe X11R6
 Summary(tr):   X11R6 ile geliþtirme için gerekli dosyalar
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-libs = %{version}
 Obsoletes:     xpm-devel
 Provides:      xpm-devel
@@ -613,8 +547,6 @@ yan
 Summary:       Alliance Promotion video driver
 Summary(pl):   Sterownik do kart Alliance Promotion
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Alliance
@@ -629,8 +561,6 @@ Sterownik do kart Alliance Promotion.
 Summary:       Ark Logic video driver
 Summary(pl):   Sterownik do kart Ark Logic
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -644,8 +574,6 @@ Sterownik do kart Ark Logic.
 Summary:       ATI video driver
 Summary(pl):   Sterownik do kart ATI
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-ATI XFree86-Mach32 XFree86-Mach64
@@ -656,12 +584,41 @@ ATI video driver.
 %description driver-ati -l pl
 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
+Obsoletes:      XFree86-Rage128
+
+%description driver-r128
+ATI Rage 128 video driver.
+
+%description driver-r128 -l pl
+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
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl
+Sterownik do kart ATI Radeon.
+
 %package driver-chips
 Summary:       Chips and Technologies video driver
 Summary(pl):   Sterownik do kart na uk³adach Chips and Technologies
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-ChipsTechnologies
@@ -676,8 +633,6 @@ Sterownik do kart na uk
 Summary:       Cirrus Logic video driver
 Summary(pl):   Sterownik do kart Cirrus Logic
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Cirrus
@@ -692,8 +647,6 @@ Sterownik do kart Cirrus Logic.
 Summary:       Cyrix video driver
 Summary(pl):   Sterownik do grafiki na uk³adzie Cyrix MediaGX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Cyrix
@@ -708,8 +661,6 @@ Sterownik do grafiki na uk
 Summary:       Video driver for framebuffer device
 Summary(pl):   Sterownik korzystaj±cy z framebuffera
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-FBDev
@@ -724,8 +675,6 @@ Nieakcelerowany sterownik korzystaj
 Summary:       Video driver for DRI sparc framebuffer device
 Summary(pl):   Sterownik do framebuffera DRI na sparc
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -739,8 +688,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -754,8 +701,6 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx.
 Summary:       GLINT/Permedia video driver
 Summary(pl):   Sterownik do kart GLINT i Permedia
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      OpenGL
@@ -771,8 +716,6 @@ Sterownik do kart GLINT i Permedia.
 Summary:       Number 9 I128 video driver
 Summary(pl):   Sterownik do kart Number 9 I128
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-I128
@@ -787,8 +730,6 @@ Sterownik do kart Number 9 I128.
 Summary:       Intel i740 video driver
 Summary(pl):   Sterownik do kart na uk³adzie Intel i740
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-i740
@@ -803,8 +744,6 @@ Sterownik do kart na uk
 Summary:       Intel i810/i815 video driver
 Summary(pl):   Sterownik do grafiki na uk³adach Intel i810 i i815
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      OpenGL
@@ -820,8 +759,6 @@ Sterownik do grafiki na uk
 Summary:       Matrox video driver
 Summary(pl):   Sterownik do kart Matrox
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      OpenGL
@@ -837,8 +774,6 @@ Sterownik do kart Matrox.
 Summary:       NeoMagic video driver
 Summary(pl):   Sterownik do kart NeoMagic
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-NeoMagic
@@ -853,8 +788,6 @@ Sterownik do kart NeoMagic.
 Summary:       nVidia video driver
 Summary(pl):   Sterownik do kart na uk³adach firmy nVidia
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-NVidia
@@ -865,45 +798,10 @@ nVidia video driver. Supports Riva128, RivaTNT, GeForce.
 %description driver-nv -l pl
 Sterownik do kart na uk³adach firmy nVidia: Riva128, RivaTNT, GeForce.
 
-%package driver-r128
-Summary:       ATI Rage 128 video driver
-Summary(pl):   Sterownik do kart ATI Rage 128
-Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
-Requires:      %{name}-modules = %{version}-%{release}
-Requires:      %{name}-Xserver = %{version}-%{release}
-Requires:      OpenGL
-Obsoletes:     XFree86-Rage128
-
-%description driver-r128
-ATI Rage 128 video driver.
-
-%description driver-r128 -l pl
-Sterownik do kart ATI Rage 128.
-
-%package driver-radeon
-Summary:       ATI Radeon video driver
-Summary(pl):   Sterownik do kart ATI Radeon
-Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
-Requires:      %{name}-modules = %{version}-%{release}
-Requires:      %{name}-Xserver = %{version}-%{release}
-Requires:      OpenGL
-
-%description driver-radeon
-ATI Radeon video driver.
-
-%description driver-radeon -l pl
-Sterownik do kart ATI Radeon.
-
 %package driver-rendition
 Summary:       Rendition video driver
 Summary(pl):   Sterownik do kart Rendition
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Rendition
@@ -918,8 +816,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-S3V
@@ -934,8 +830,6 @@ Sterownik do kart na uk
 Summary:       S3 Trio video driver
 Summary(pl):   Sterownik do kart na uk³adach S3 Trio
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-S3
@@ -950,8 +844,6 @@ Sterownik do kart na uk
 Summary:       S3 Savage video driver
 Summary(pl):   Sterownik do kart na uk³adach S3 Savage
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -965,8 +857,6 @@ Sterownik do kart na uk
 Summary:       Silicon Motion video driver
 Summary(pl):   Sterownik do kart na uk³adach Silicon Motion
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -980,8 +870,6 @@ Sterownik do kart na uk
 Summary:       SiS video driver
 Summary(pl):   Sterownik do kart na uk³adach SiS
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-SiS
@@ -996,8 +884,6 @@ Sterownik do kart na uk
 Summary:       sunbw2 - Sun BW2 video driver
 Summary(pl):   Sterownik do monochromatycznego framebuffera BW2 na Sunie
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-SunMono
@@ -1012,8 +898,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1027,8 +911,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1042,8 +924,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1057,8 +937,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1072,8 +950,6 @@ 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
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1087,8 +963,6 @@ Sterownik do kart Sun Leo (ZX).
 Summary:       suntcx - Sun TCX video cards driver
 Summary(pl):   Sterownik do kart Sun TCX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1102,8 +976,6 @@ Sterownik do kart Sun TCX.
 Summary:       3Dfx video driver
 Summary(pl):   Sterownik do kart 3Dfx
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Requires:      OpenGL
@@ -1124,8 +996,6 @@ a Glide_V5-DRI do kart Voodoo4 lub Voodoo5.
 Summary:       TGA video driver
 Summary(pl):   Sterownik do kart TGA
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-TGA
@@ -1140,8 +1010,6 @@ Sterownik do kart TGA.
 Summary:       Trident video driver
 Summary(pl):   Sterownik do kart Trident
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Trident
@@ -1156,8 +1024,6 @@ Sterownik do kart Trident.
 Summary:       Tseng Labs video driver
 Summary(pl):   Sterownik do kart Tseng Labs
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 Obsoletes:     XFree86-Tseng XFree86-W32
@@ -1172,8 +1038,6 @@ Sterownik do kart firmy Tseng Labs.
 Summary:       VMWare SVGA emulated video driver
 Summary(pl):   Sterownik do emulacji karty SVGA dostêpnej pod VMware
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}-%{release}
 Requires:      %{name}-Xserver = %{version}-%{release}
 
@@ -1193,11 +1057,6 @@ Summary(pl):     Biblioteki dzielone dla X11R6
 Summary(fr):   Bibliothèques partagées X11R6
 Summary(pt_BR):        Bibliotecas compartilhadas X11R6
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(es):     X11/XFree86
-Group(fr):     X11/XFree86
-Group(pl):     X11/XFree86
-Group(pt_BR):  X11/XFree86
 PreReq:                grep
 Obsoletes:     xpm
 Provides:      xpm
@@ -1263,11 +1122,6 @@ aplica
 Summary:       Modules with X servers extensions
 Summary(pl):   Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(es):     X11/XFree86
-Group(fr):     X11/XFree86
-Group(pl):     X11/XFree86
-Group(pt_BR):  X11/XFree86
 
 %description modules
 Modules with X servers extensions.
@@ -1279,8 +1133,6 @@ Wsp
 Summary:       PEX extension module
 Summary(pl):   Modu³ rozszerzenia PEX
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}
 
 %description module-PEX
@@ -1295,8 +1147,6 @@ ju
 Summary:       XIE extension module
 Summary(pl):   Modu³ rozszerzenia XIE
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-modules = %{version}
 
 %description module-XIE
@@ -1311,8 +1161,6 @@ XFree86 4.2.0 nie jest ju
 Summary:       Graphical configuration tool for XFree86
 Summary(pl):   Graficzny konfigurator dla XFree86
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-Xserver = %{version}
 Obsoletes:     XFree86-xf86cfg
 
@@ -1332,13 +1180,6 @@ standardowej 16-kolorowej VGA.
 Summary:       X11R6 static libraries
 Summary(pl):   Biblioteki statyczne X11R6
 Group:         X11/Libraries
-Group(de):     X11/Libraries
-Group(es):     X11/Bibliotecas
-Group(fr):     X11/Librairies
-Group(pl):     X11/Biblioteki
-Group(pt_BR):  X11/Bibliotecas
-Group(ru):     X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):     X11/â¦Â̦ÏÔÅËÉ
 Requires:      %{name}-devel = %{version}
 %ifarch sparc sparc64
 Obsoletes:     X11R6.1-devel
@@ -1356,8 +1197,6 @@ Biblioteki statyczne X11R6.
 Summary:       Various tools for XFree86
 Summary(pl):   Ró¿ne narzêdzia dla XFree86
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name} >= %{version}
 Requires:      XFree86-libs = %{version}
 Obsoletes:     X11R6-contrib
@@ -1396,8 +1235,6 @@ wersjach X.
 Summary:       sessreg - manage utmp/wtmp entries for non-init clients
 Summary(pl):   Program do zarz±dzania wpisami w utmp/wtmp
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 
 %description -n sessreg
 sessreg is a simple program for managing utmp/wtmp entries for xdm
@@ -1419,10 +1256,6 @@ indeksowanych po
 Summary:       Tab Window Manager for the X Window System
 Summary(pl):   Twm - podstawowy zarz±dca okien dla X Window System
 Group:         X11/Window Managers
-Group(de):     X11/Fenstermanager
-Group(es):     X11/Administraadores De Ventanas
-Group(fr):     X11/Gestionnaires De Fenêtres
-Group(pl):     X11/Zarz±dcy Okien
 Requires:      XFree86-libs = %{version}
 
 %description -n twm
@@ -1441,8 +1274,6 @@ definiowalne przypisania klawiszy i przycisk
 Summary:       xauth - X authority file utility
 Summary(pl):   xauth - narzêdzie do plików X authority
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-libs = %{version}
 
 %description -n xauth
@@ -1463,8 +1294,6 @@ logowania lub udost
 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
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name} = %{version}
 Requires:      pam >= 0.71
 Requires:      %{name}-libs = %{version}
@@ -1491,8 +1320,6 @@ terminali oraz standardem X Consortium XDMCP.
 Summary:       Font server for XFree86
 Summary(pl):   Serwer fontów dla XFree86
 Group:         X11/XFree86
-Group(de):     X11/XFree86
-Group(pl):     X11/XFree86
 Requires:      %{name}-libs = %{version}
 Requires:      XFree86-fonts-base
 PreReq:                chkconfig
@@ -1561,6 +1388,14 @@ serwer
 
 rm -f xc/config/cf/host.def
 
+# New ATI drivers
+cd xc/programs/Xserver/hw/xfree86/drivers
+bzcat %{SOURCE16} | tar x
+mv ati ati.old
+mv ati.2 ati
+cd ati.old
+%patch34 -p1
+
 #--- %build --------------------------
 
 %build
@@ -1570,6 +1405,15 @@ rm -f xc/config/cf/host.def
        "CXXOPTIONS=%{rpmcflags}" \
        "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
 
+%ifnarch alpha
+%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.old" Makefiles
+%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.old" all \
+       "BOOTSTRAPCFLAGS=%{rpmcflags}" \
+       "CCOPTIONS=%{rpmcflags}" \
+       "CXXOPTIONS=%{rpmcflags}" \
+       "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+%endif
+
 #--- %install ------------------------
 
 %install
@@ -1594,6 +1438,17 @@ install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysc
                "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
                install install.man
 
+%ifnarch alpha
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/ati_drv.o \
+       $RPM_BUILD_ROOT%{_libdir}/modules/drivers/ati_old_drv.o 
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/atimisc_drv.o \
+       $RPM_BUILD_ROOT%{_libdir}/modules/drivers/atimisc_old_drv.o
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/r128_drv.o \
+       $RPM_BUILD_ROOT%{_libdir}/modules/drivers/r128_old_drv.o
+install xc/programs/Xserver/hw/xfree86/drivers/ati.old/radeon_drv.o \
+       $RPM_BUILD_ROOT%{_libdir}/modules/drivers/radeon_old_drv.o
+%endif
+
 # setting default X
 rm -f $RPM_BUILD_ROOT%{_bindir}/X
 ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
@@ -1798,7 +1653,6 @@ fi
 %attr(755,root,root) %{_libdir}/X11/lbxproxy
 %attr(755,root,root) %{_libdir}/X11/proxymngr
 %attr(755,root,root) %{_libdir}/X11/rstart
-%attr(755,root,root) %{_libdir}/X11/xserver
 %attr(755,root,root) %{_libdir}/X11/fonts
 %attr(755,root,root) %{_libdir}/X11/xinit
 %attr(755,root,root) %{_libdir}/X11/xsm
@@ -1819,8 +1673,6 @@ fi
 %attr(755,root,root) /etc/X11/rstart/commands/x11r6/*
 %dir /etc/X11/rstart/contexts
 /etc/X11/rstart/contexts/*
-%dir /etc/X11/xserver
-/etc/X11/xserver/SecurityPolicy
 %dir /etc/X11/xsm
 /etc/X11/xsm/*
 
@@ -1865,7 +1717,6 @@ fi
 %attr(755,root,root) %{_bindir}/xhost
 %attr(755,root,root) %{_bindir}/xinit
 %attr(755,root,root) %{_bindir}/xkbbell
-%attr(755,root,root) %{_bindir}/xkbcomp
 %attr(755,root,root) %{_bindir}/xkbevd
 %attr(755,root,root) %{_bindir}/xkbprint
 %attr(755,root,root) %{_bindir}/xkbvleds
@@ -1936,7 +1787,6 @@ fi
 %{_mandir}/man1/xgamma.1*
 %{_mandir}/man1/xhost.1*
 %{_mandir}/man1/xinit.1*
-%{_mandir}/man1/xkbcomp.1*
 %{_mandir}/man1/xkbevd.1*
 %{_mandir}/man1/xkbprint.1*
 %{_mandir}/man1/xlsatoms.1*
@@ -2152,26 +2002,19 @@ fi
 %{_mandir}/man1/xmkmf.1*
 %{_mandir}/man3/[A-EH-Z]*
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-apm
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
 %{_mandir}/man4/apm*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-ark
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
 %endif
 
-%ifnarch alpha
-%files driver-ati
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
-#%{_mandir}/man4/ati*
-%endif
-
 %ifnarch sparc sparc64 alpha
 %files driver-chips
 %defattr(644,root,root,755)
@@ -2179,14 +2022,14 @@ fi
 %{_mandir}/man4/chips*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-cirrus
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
 %{_mandir}/man4/cirrus*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-cyrix
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
@@ -2200,7 +2043,7 @@ fi
 %{_mandir}/man4/fbdev*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-glide
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
@@ -2215,21 +2058,21 @@ fi
 %endif
 %{_mandir}/man4/glint*
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-i128
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
 %{_mandir}/man4/i128*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-i740
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
 %{_mandir}/man4/i740*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-i810
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
@@ -2245,44 +2088,47 @@ fi
 %{_mandir}/man4/mga*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-neomagic
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
 %{_mandir}/man4/neomagic*
 %endif
 
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
 %files driver-nv
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
 %{_mandir}/man4/nv*
 %endif
 
-%ifnarch sparc sparc64
-%files driver-r128
-%defattr(644,root,root,755)
 %ifnarch alpha
-%attr(755,root,root) %{_libdir}/modules/drivers/r128_drv.o
+%files driver-ati
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/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
 %ifnarch sparc sparc64
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
-%ifnarch alpha
 %{_mandir}/man4/r128*
 %endif
-%endif
 
+%ifnarch alpha
 %files driver-radeon
 %defattr(644,root,root,755)
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/modules/drivers/radeon_drv.o
-%endif
+%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
 %ifnarch sparc sparc64
 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
 %endif
+%endif
 
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
 %files driver-rendition
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
@@ -2310,14 +2156,14 @@ fi
 %{_mandir}/man4/savage*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha 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
+%ifnarch sparc sparc64 alpha ppc
 %files driver-sis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
@@ -2383,7 +2229,7 @@ fi
 %{_mandir}/man4/tdfx*
 %endif
 
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
 %files driver-tga
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
@@ -2396,7 +2242,7 @@ fi
 %{_mandir}/man4/trident*
 %endif
 
-%ifnarch sparc sparc64 alpha
+%ifnarch sparc sparc64 alpha ppc
 %files driver-tseng
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
@@ -2440,6 +2286,7 @@ fi
 
 %files modules
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xkbcomp
 %{_libdir}/X11/xkb
 %{_sysconfdir}/X11/xkb
 /var/lib/xkb
@@ -2447,8 +2294,9 @@ fi
 %ifnarch alpha
 %dir %{_libdir}/modules/dri
 %endif
+%dir %{_libdir}/modules/multimedia
 %dir %{_libdir}/modules/drivers
-%ifnarch sparc sparc64
+%ifnarch sparc sparc64 ppc
 %{_libdir}/modules/*.uc
 %endif
 %attr(755,root,root) %{_libdir}/modules/*.a
@@ -2456,7 +2304,7 @@ fi
 %attr(755,root,root) %{_libdir}/modules/drivers/linux
 %ifnarch sparc sparc64
 %attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
-%ifnarch alpha
+%ifnarch alpha ppc
 %attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
 %endif
 %endif
@@ -2469,6 +2317,10 @@ fi
 %attr(755,root,root) %{_libdir}/modules/fonts
 %attr(755,root,root) %{_libdir}/modules/input
 %attr(755,root,root) %{_libdir}/modules/linux
+%attr(755,root,root) %{_libdir}/X11/xserver
+%dir /etc/X11/xserver
+/etc/X11/xserver/SecurityPolicy
+%{_mandir}/man1/xkbcomp.1*
 %{_mandir}/man4/citron*
 %{_mandir}/man4/dynapro*
 %{_mandir}/man4/keyboard*
@@ -2477,7 +2329,7 @@ fi
 %{_mandir}/man4/v4l*
 %ifnarch sparc sparc64
 %{_mandir}/man4/vga*
-%ifnarch alpha
+%ifnarch alpha ppc
 %{_mandir}/man4/vesa*
 %endif
 %endif
@@ -2499,10 +2351,14 @@ fi
 %files setup
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/pcitweak
+%ifnarch ppc
 %attr(755,root,root) %{_bindir}/scanpci
+%endif
 %attr(755,root,root) %{_bindir}/xf86cfg
 %attr(755,root,root) %{_bindir}/xf86config
+%ifnarch ppc
 %{_mandir}/man1/scanpci.1*
+%endif
 %{_mandir}/man1/pcitweak.1*
 %{_mandir}/man1/xf86cfg.1*
 %{_mandir}/man1/xf86config.1*