+
+%define _sver %(echo %{version} | tr -d .)
+
Summary: XFree86 Window System servers and basic programs
Summary(de): Xfree86 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86
Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar
Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86
Name: XFree86
-Version: 4.1.0
-Release: 14
+Version: 4.2.0
+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/4.1.0/source/X410src-1.tgz
+Source0: ftp://ftp.xfree86.org/pub/XFree86/%{version}/source/X%{_sver}src-1.tgz
Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
Source2: xdm.pamd
Source3: xserver.pamd
Source12: xconsole.desktop
Source13: xterm.desktop
Source14: xlogo64.png
-Source15: http://papico.crl.go.jp/pub/linux/linuxppc/users/ajoshi/s3/s3-0.3.52.tgz
-Source16: %{name}-non-english-Xman-pages.tar.bz2
+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
Patch18: %{name}-no-kernel-modules.patch
Patch19: %{name}-parallelmake.patch
Patch20: %{name}-pic.patch
-Patch21: %{name}-defmodes-1400.patch
-Patch22: %{name}-r128-busmstr2.patch
-Patch23: %{name}-neomagic_swcursor.patch
-Patch24: %{name}-mga-busmstr.patch
-Patch25: %{name}-agpgart-load.patch
-Patch26: %{name}-mkfontdir-chmod_644.patch
-Patch27: %{name}-HasFreetype2.patch
-Patch28: %{name}-libXfont-put-eof.patch
-Patch29: %{name}-config-s3.patch
-Patch30: %{name}-stolen_from_HEAD.patch
-Patch31: %{name}-sparc_pci_domains.patch
-Patch32: %{name}-s3virge_mx_console_corruption_fix.patch
-Patch33: %{name}-cirrus_driver_fix.patch
-Patch34: %{name}-dri_directory_mode_fix.patch
-Patch35: %{name}-alpha_GLX_align_fix.patch
-Patch36: %{name}-manpage_link_fixes.patch
-Patch37: %{name}-XftConfig_in_correct_place.patch
-Patch38: %{name}-i740.patch
-Patch39: %{name}-compaq-alpha-megapatch.patch
+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
+Patch26: %{name}-HasFreetype2.patch
+Patch27: %{name}-config-s3.patch
+Patch28: %{name}-sparc_pci_domains.patch
+Patch29: %{name}-s3virge_mx_console_corruption_fix.patch
+Patch30: %{name}-dri_directory_mode_fix.patch
+Patch31: %{name}-alpha_GLX_align_fix.patch
+Patch32: %{name}-XftConfig_in_correct_place.patch
+Patch33: %{name}-PEX+XIE.patch
+Patch34: %{name}-ati.old-rename.patch
BuildRequires: bison
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
+BuildRequires: libstdc++-devel
%ifarch %{ix86} alpha
BuildRequires: Glide3-DRI-devel
%endif
%ifarch %{ix86}
BuildRequires: Glide2x_SDK
%endif
-Requires: XFree86-fonts-ISO8859-1 = %{version}
-Requires: XFree86-libs = %{version}
Requires: xauth
-Requires(post): fileutils
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch
+Requires: %{name}-libs = %{version}
+Requires: %{name}-common = %{version}
+ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
Obsoletes: xterm
%define _wmpropsdir %{_datadir}/wm-properties
# avoid Mesa dependency in XFree86-OpenGL-libs
-%define _noautoreqdep libGL.so.1 libGLU.so.1
-
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
-%define _noautoreqdep libglide3.so.3
+%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
%description
If you want to install the X Window System (TM) on your machine,
uma estação de trabalho X. Ele não fornece um servidor X que acessa
seu hardware de vídeo -- estes são disponibilizados em outro pacote.
+%package common
+Summary: XFree86 files required both on server and client side
+Summary(pl): Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta
+Group: X11/XFree86
+
+%description common
+XFree86 files required both on server and client side.
+
+%description common -l pl
+Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta.
+
%package DPS
Summary: Display PostScript
Summary(pl): Display PostScript
Group: X11/XFree86
-Group(de): X11/XFree86
-Group(pl): X11/XFree86
Provides: DPS
Obsoletes: dgs
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
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
%description DPS-static -l pl
Statyczne biblioteki X-Window Display PostScript.
+%package PEX
+Summary: PEX extension library
+Summary(pl): Biblioteka rozszerzenia PEX
+Group: X11/XFree86
+Requires: %{name}-libs = %{version}
+
+%description PEX
+PEX extension library. Since XFree86 4.2.0 it's no longer included by
+default.
+
+%description PEX -l pl
+Biblioteka rozszerzenia PEX. Od wersji XFree86 4.2.0 nie jest ju¿
+do³±czane domy¶lnie.
+
+%package PEX-devel
+Summary: PEX extension headers
+Summary(pl): Pliki nag³ówkowe rozszerzenia PEX
+Group: X11/XFree86
+Requires: %{name}-PEX = %{version}
+
+%description PEX-devel
+PEX extension headers.
+
+%description PEX-devel -l pl
+Pliki nag³ówkowe rozszerzenia PEX.
+
+%package PEX-static
+Summary: PEX extension static library
+Summary(pl): Statyczna biblioteka rozszerzenia PEX
+Group: X11/XFree86
+Requires: %{name}-PEX-devel = %{version}
+
+%description PEX-static
+PEX extension static library.
+
+%description PEX-static -l pl
+Statyczna biblioteka rozszerzenia PEX.
+
+%package XIE
+Summary: XIE extension library
+Summary(pl): Biblioteka rozszerzenia XIE
+Group: X11/XFree86
+Requires: %{name}-libs = %{version}
+
+%description XIE
+XIE (X Image Extension) extension library. Since XFree86 4.2.0 it's no
+longer included by default.
+
+%description XIE -l pl
+Biblioteka rozszerzenia XIE (X Image Extension). Od wersji XFree86
+4.2.0 nie jest ju¿ do³±czane domy¶lnie
+
+%package XIE-devel
+Summary: XIE extension headers
+Summary(pl): Pliki nag³ówkowe rozszerzenia XIE
+Group: X11/XFree86
+Requires: %{name}-XIE = %{version}
+
+%description XIE-devel
+XIE extension headers.
+
+%description XIE-devel -l pl
+Pliki nag³ówkowe rozszerzenia XIE.
+
+%package XIE-static
+Summary: XIE extension static library
+Summary(pl): Statyczna biblioteka rozszerzenia XIE
+Group: X11/XFree86
+Requires: %{name}-XIE-devel = %{version}
+
+%description XIE-static
+XIE extension static library.
+
+%description XIE-static -l pl
+Statyczna biblioteka rozszerzenia XIE.
+
%package OpenGL-core
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}
-Obsoletes: Mesa
%description OpenGL-core
OpenGL support for X11R6 system.
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
-Obsoletes: Mesa-devel glxMesa-devel
+Obsoletes: Mesa-devel
+Obsoletes: glxMesa-devel
+Obsoletes: XFree86-OpenGL-doc
%description OpenGL-devel
Headers and man pages for OpenGL for X11R6.
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
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
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}-fonts >= 4.0.2
+Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: XFree86-fonts-base
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
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}-fonts >= 4.0.2
+Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: XFree86-fonts-base
%description Xprt
Xprt provides an X server with the print extension and special DDX
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: /usr/X11R6/lib/X11/rgb.txt
-Obsoletes: %{name}-VGA16 %{name}-SVGA %{name}-Mono
-Obsoletes: XFree86-S3 XFree86-S3V XFree86-I128
-Obsoletes: XFree86-Mach8 XFree86-Mach32 XFree86-Mach64
-Obsoletes: XFree86-8514 XFree86-AGX XFree86-3DLabs
-Obsoletes: XFree86-P9000 XFree86-W32
-Obsoletes: XFree86-ATI XFree86-Alliance XFree86-ChipsTechnologies
-Obsoletes: XFree86-Cirrus XFree86-Cyrix XFree86-FBDev
-Obsoletes: XFree86-i740 XFree86-i810 XFree86-mga
-Obsoletes: XFree86-NeoMagic XFree86-NVidia
-Obsoletes: XFree86-Rage128 XFree86-Rendition
-Obsoletes: XFree86-S3V XFree86-SiS XFree86-3dfx
-Obsoletes: XFree86-Trident XFree86-Tseng XFree86-VGA16
-Obsoletes: XFree86-TGA XFree86-FBDev
-Obsoletes: XFree86-Sun XFree86-Sun24 XFree86-SunMono
-Obsoletes: XFree86-XF86Setup, Xconfigurator
+Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: XFree86-fonts-base
+Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono
+# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
+Obsoletes: XFree86-Sun XFree86-Sun24
+# still not supported in 4.2.0:
+#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+# (and many drivers from XF86_SVGA server... and some from others)
+Obsoletes: XFree86-XF86Setup Xconfigurator
%description Xserver
Generally used X server which uses display hardware. It requires
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}-fonts >= 4.0.2
+Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: XFree86-fonts-base
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
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
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
%description driver-apm
Alliance Promotion driver.
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}
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
%description driver-ati
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
%description driver-chips
Chips and Technologies video driver.
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
%description driver-cirrus
Cirrus Logic video driver.
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
%description driver-cyrix
Cyrix video driver.
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
%description driver-fbdev
Non-accelerated video driver for framebuffer device.
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}
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}
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
+Obsoletes: XFree86-3DLabs
%description driver-glint
GLINT/Permedia video driver.
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
%description driver-i128
Number 9 I128 video driver.
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
%description driver-i740
Intel i740 video driver.
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
+Obsoletes: XFree86-i810
%description driver-i810
Intel i810/i815 video driver.
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
+Obsoletes: XFree86-mga
%description driver-mga
Matrox video driver.
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
%description driver-neomagic
NeoMagic video driver.
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
%description driver-nv
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
-
-%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
%description driver-rendition
Rendition/Micron video driver.
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
%description driver-s3virge
S3 ViRGE/Trio3D video driver.
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
%description driver-s3
S3 Trio video driver.
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}
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}
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
%description driver-sis
SiS video driver.
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
%description driver-sunbw2
sunbw2 - Sun BW2 video driver.
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}
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}
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}
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}
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}
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}
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
Requires: Glide3-DRI
+Obsoletes: XFree86-3dfx
%description driver-tdfx
3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, 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
%description driver-tga
TGA video driver.
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
%description driver-trident
Trident video driver.
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
%description driver-tseng
Tseng Labs video driver.
Sterownik do kart firmy Tseng Labs.
%package driver-vmware
-Summary: VMWare SVGA video driver
-Summary(pl): Sterownik do emulowanych kart SVGA pod VMware
+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}
%description driver-vmware
-VMware SVGA video driver.
+VMware emulated SVGA video driver. Necessary if you run Linux on
+VMware virtual machine.
%description driver-vmware -l pl
-Sterownik do emulowanych kart SVGA pod VMware.
+Sterownik do emulacji karty SVGA dostêpnej pod VMware. Przydatny,
+je¶li uruchamiasz Linuksa na wirtualnej maszynie VMware.
%package libs
Summary: X11R6 shared libraries
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: /sbin/ldconfig
PreReq: grep
Obsoletes: xpm
Provides: xpm
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.
%description modules -l pl
Wspólne dla wszystkich X serwerów modu³y rozszerzeñ.
+%package module-PEX
+Summary: PEX extension module
+Summary(pl): Modu³ rozszerzenia PEX
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}
+
+%description module-PEX
+PEX extension module for X server. Since XFree86 4.2.0 it's no longer
+included by default.
+
+%description module-PEX -l pl
+Modu³ rozszerzenia PEX dla X serwera. Od wersji XFree86 4.2.0 nie jest
+ju¿ do³±czane domy¶lnie.
+
+%package module-XIE
+Summary: XIE extension module
+Summary(pl): Modu³ rozszerzenia XIE
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}
+
+%description module-XIE
+XIE (X Image Extension) extension module for X server. Since XFree86
+4.2.0 it's no longer included by default.
+
+%description module-XIE -l pl
+Modu³ rozszerzenia XIE (X Image Extension) dla X serwera. Od wersji
+XFree86 4.2.0 nie jest ju¿ do³±czane domy¶lnie.
+
%package setup
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
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
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
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
-Requires: %{name}-libs = %{version}
%description -n sessreg
sessreg is a simple program for managing utmp/wtmp entries for xdm
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
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
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}
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
-PreReq: /usr/sbin/useradd
-PreReq: /usr/sbin/groupadd
-PreReq: /usr/sbin/userdel
-PreReq: /usr/sbin/groupdel
-PreReq: /usr/bin/getgid
-PreReq: /bin/id
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/useradd
+Requires(pre): /usr/sbin/groupadd
+Requires(postun): /usr/sbin/groupdel
+Requires(postun): /usr/sbin/userdel
Obsoletes: xfsft XFree86-xfs
%description -n xfs
%patch3 -p1
%patch4 -p1
%patch5 -p0
-# Not ready yet
+# not ready yet
#%patch6 -p0
%patch7 -p1
%patch8 -p1
%patch25 -p1
%patch26 -p1
%patch27 -p1
-%patch28 -p1
-%patch29 -p1
+%ifarch sparc sparc64
+# needs updating (14 rejects)
+#%patch28 -p1
+%endif
+# don't see what exatly it is doing, is it needed now?
+# could someone else look at it (rejects)
+#%patch29 -p1
%patch30 -p1
%patch31 -p1
%patch32 -p1
%patch33 -p1
-%patch34 -p1
-%patch35 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%ifarch alpha
-%patch39 -p0
-%endif
+
rm -f xc/config/cf/host.def
-tar zx -f %{SOURCE15} -C xc/programs/Xserver/hw/xfree86/drivers/
+
+# 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 --------------------------
"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
install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl \
$RPM_BUILD_ROOT%{_datadir}/{misc,sounds} \
+ $RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_applnkdir}/{Utilities,Terminals},%{_pixmapsdir}/mini} \
"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
install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/pixmaps
-bzip2 -dc %{SOURCE16} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE15} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
-> $RPM_BUILD_ROOT/var/log/XFree86.0.log
ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts
#--- %post{un}, %preun, %verifyscript, %trigge ----------
-%post
-touch /var/log/XFree86.0.log
-chmod 000 /var/log/XFree86.0.log
-chown root.root /var/log/XFree86.0.log
-chmod 640 /var/log/XFree86.0.log
-
%post DPS -p /sbin/ldconfig
%postun DPS -p /sbin/ldconfig
+%post PEX -p /sbin/ldconfig
+%postun PEX -p /sbin/ldconfig
+
+%post XIE -p /sbin/ldconfig
+%postun XIE -p /sbin/ldconfig
+
%post OpenGL-libs -p /sbin/ldconfig
%postun OpenGL-libs -p /sbin/ldconfig
%doc %{_libdir}/X11/doc
%endif
-%{_sysconfdir}/X11/XftConfig
-
%dir %{_libdir}/X11/app-defaults
%{_libdir}/X11/app-defaults/XCalc
%{_libdir}/X11/app-defaults/XCalc-color
%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
+%dir /etc/X11/xinit
%dir /etc/X11/lbxproxy
+/etc/X11/lbxproxy/*
%dir /etc/X11/proxymngr
+/etc/X11/proxymngr/*
%dir /etc/X11/rstart
+/etc/X11/rstart/config
+%attr(755,root,root) /etc/X11/rstart/rstartd.real
%dir /etc/X11/rstart/commands
+/etc/X11/rstart/commands/x
+/etc/X11/rstart/commands/x11
+%attr(755,root,root) /etc/X11/rstart/commands/*List*
%dir /etc/X11/rstart/commands/x11r6
+%attr(755,root,root) /etc/X11/rstart/commands/x11r6/*
%dir /etc/X11/rstart/contexts
-%dir /etc/X11/xserver
+/etc/X11/rstart/contexts/*
%dir /etc/X11/xsm
-%dir /etc/X11/xinit
-
-/etc/X11/lbxproxy/*
-/etc/X11/proxymngr/*
-%attr(-,root,root) /etc/X11/rstart/config
-%attr(-,root,root) /etc/X11/rstart/rstartd.real
-%attr(-,root,root) /etc/X11/rstart/commands/x
-%attr(-,root,root) /etc/X11/rstart/commands/x11
-%attr(-,root,root) /etc/X11/rstart/commands/*List*
-%attr(-,root,root) /etc/X11/rstart/commands/x11r6/*
-%attr(-,root,root) /etc/X11/rstart/contexts/*
-/etc/X11/xserver/SecurityPolicy
/etc/X11/xsm/*
%lang(pl) %{_libdir}/X11/app-defaults/pl
%dir %{_libdir}/X11/x11perfcomp
%attr(755,root,root) %{_libdir}/X11/x11perfcomp/*
-%{_libdir}/X11/*.txt
%attr(755,root,root) %{_bindir}/Xmark
%attr(755,root,root) %{_bindir}/appres
%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
%{_includedir}/X11/bitmaps
%{_includedir}/X11/pixmaps
-%attr(640,root,root) %ghost /var/log/XFree86.0.log
-
-%{_applnkdir}/Utilities/*
+%{_applnkdir}/Utilities/xconsole.desktop
%{_applnkdir}/Terminals/*
%{_libdir}/X11/app-defaults/Xvidtune
%{_pixmapsdir}/x*
%{_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*
%lang(pl) %{_mandir}/pl/man1/xinit.1*
%lang(pl) %{_mandir}/pl/man1/xwd.1*
+%files common
+%defattr(644,root,root,755)
+%{_libdir}/X11/rgb.txt
+
%files DPS
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/makepsres
%{_libdir}/libdpstk.a
%{_libdir}/libpsres.a
+%ifnarch alpha sparc64 ia64 s390x
+%files PEX
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libPEX5.so.*.*
+
+%files PEX-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libPEX5.so
+%{_includedir}/X11/PEX5
+
+%files PEX-static
+%defattr(644,root,root,755)
+%{_libdir}/libPEX5.a
+%endif
+
+%files XIE
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXIE.so.*.*
+
+%files XIE-devel
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libXIE.so
+%{_includedir}/X11/extensions/XIE*
+
+%files XIE-static
+%defattr(644,root,root,755)
+%{_libdir}/libXIE.a
+
%files OpenGL-core
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGL.so.*.*
%{_libdir}/libGLw.a
%dir %{_includedir}/GL
%attr(644,root,root) %{_includedir}/GL/*
-%{_mandir}/man3/glX*
+%{_mandir}/man3/gl[A-Z]*
%{_mandir}/man3/glu*
%{_mandir}/man3/GLw*
%{_libdir}/libGL.a
%{_libdir}/libGLU.a
%ifnarch alpha
-%attr(755,root,root) %{_libdir}/libOSMesa*.a
+%{_libdir}/libOSMesa*.a
%endif
%files Xnest
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/gccmakedep
%attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_libdir}/libX*.so
+%attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so
%attr(755,root,root) %{_libdir}/libI*.so
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/libP*.so
-%endif
%attr(755,root,root) %{_libdir}/libS*.so
%ifnarch alpha
%attr(755,root,root) %{_libdir}/libx*.so
%{_libdir}/libXinerama.a
%{_includedir}/X11/*.h
%{_includedir}/X11/ICE
-%ifnarch alpha
-%{_includedir}/X11/PEX5
-%endif
%{_includedir}/X11/PM
%{_includedir}/X11/SM
%{_includedir}/X11/Xaw
%{_includedir}/X11/Xft
%{_includedir}/X11/Xmu
-%{_includedir}/X11/extensions
+%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/fonts
%{_includedir}/xf86*.h
%{_libdir}/X11/config
%{_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)
%{_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
%{_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
%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
%{_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
%{_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
%{_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
%{_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
%dir %{_includedir}
%dir %{_includedir}/X11
%dir %{_bindir}
+%dir %{_sbindir}
/usr/bin/X11
/usr/lib/X11
/usr/include/X11
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_wmpropsdir}
-%attr(755,root,root) %{_libdir}/libX*.so.*.*
+%attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so.*.*
%attr(755,root,root) %{_libdir}/libI*.so.*.*
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/libP*.so.*.*
-%endif
%attr(755,root,root) %{_libdir}/libS*.so.*.*
%ifnarch alpha
%attr(755,root,root) %{_libdir}/libx*.so.*.*
%endif
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig
%files modules
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/xkbcomp
%{_libdir}/X11/xkb
%{_sysconfdir}/X11/xkb
/var/lib/xkb
%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
%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
%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.a
%attr(755,root,root) %{_libdir}/modules/extensions/libdri.a
%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.a
-%ifnarch alpha
-%attr(755,root,root) %{_libdir}/modules/extensions/libpex5.a
-%endif
%attr(755,root,root) %{_libdir}/modules/extensions/librecord.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libxie.a
+%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.a
%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*
%{_mandir}/man4/v4l*
%ifnarch sparc sparc64
%{_mandir}/man4/vga*
-%ifnarch alpha
+%ifnarch alpha ppc
%{_mandir}/man4/vesa*
%endif
%endif
%{_mandir}/man4/elographics*
%{_mandir}/man4/mutouch*
+%ifnarch alpha sparc64 ia64 s390x
+%files module-PEX
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/extensions/libpex5.a
+%endif
+
+%files module-XIE
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/extensions/libxie.a
+
%files setup
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/SuperProbe
%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
-%{_mandir}/man1/SuperProbe.1*
+%ifnarch ppc
%{_mandir}/man1/scanpci.1*
+%endif
%{_mandir}/man1/pcitweak.1*
%{_mandir}/man1/xf86cfg.1*
%{_mandir}/man1/xf86config.1*
%files static
%defattr(644,root,root,755)
%{_libdir}/libICE.a
-%ifnarch alpha
-%{_libdir}/libPEX5.a
-%endif
%{_libdir}/libSM.a
%{_libdir}/libX11.a
-%{_libdir}/libXIE.a
%{_libdir}/libXaw.a
%{_libdir}/libXft.a
%{_libdir}/libXext.a
%attr(755,root,root) %{_bindir}/xfd
%attr(755,root,root) %{_bindir}/xfontsel
%attr(755,root,root) %{_bindir}/xgc
-%attr(755,root,root) %{_bindir}/xieperf
%attr(755,root,root) %{_bindir}/xload
%attr(755,root,root) %{_bindir}/xmag
%attr(755,root,root) %{_bindir}/xman
%attr(755,root,root) %{_bindir}/xlogo
%attr(755,root,root) %{_bindir}/xkill
%attr(755,root,root) %{_bindir}/rman
+%attr(755,root,root) %{_bindir}/xtrap*
+%attr(755,root,root) %{_bindir}/texteroids
%{_libdir}/X11/xman.help
%{_mandir}/man1/beforelight.1*
%{_mandir}/man1/ico.1*
%{_mandir}/man1/xfd.1*
%{_mandir}/man1/xfontsel.1*
%{_mandir}/man1/xgc.1*
-%{_mandir}/man1/xieperf.1*
%{_mandir}/man1/xload.1*
%{_mandir}/man1/xmag.1*
%{_mandir}/man1/xman.1*
%{_mandir}/man1/xlogo.1*
%{_mandir}/man1/oclock.1*
%{_mandir}/man1/rman.1*
+%{_mandir}/man1/xtrap.1*
+%{_mandir}/man1/texteroids.1*
%lang(it) %{_mandir}/it/man1/xload.1*
%{_libdir}/X11/app-defaults/Xditview
%{_libdir}/X11/app-defaults/Xditview-chrtr
+%{_applnkdir}/Utilities/xclipboard.desktop
+
%files -n sessreg
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/sessreg
%{_mandir}/man1/xdm.1*
%dir /etc/X11/xdm
-%attr(755,root,root) %config /etc/X11/xdm/GiveConsole
-%attr(755,root,root) %config /etc/X11/xdm/TakeConsole
-%attr(755,root,root) %config /etc/X11/xdm/Xsession
-%attr(755,root,root) %config /etc/X11/xdm/Xsetup_0
-%attr(755,root,root) %config /etc/X11/xdm/Xwilling
-%config /etc/X11/xdm/Xaccess
-%config /etc/X11/xdm/Xresources
-%config /etc/X11/xdm/Xservers
-%config /etc/X11/xdm/xdm-config
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/GiveConsole
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/TakeConsole
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsetup_0
+%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xwilling
+%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xaccess
+%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xresources
+%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xservers
+%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/xdm-config
/etc/X11/xdm/pixmaps
/etc/X11/xdm/authdir
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
%dir %{_sysconfdir}/X11/fs
%attr(755,root,root) %{_libdir}/X11/fs
-%config(noreplace) %{_sysconfdir}/X11/fs/config
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XftConfig
+%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
%attr(755,root,root) %{_bindir}/xfs
%attr(755,root,root) %{_bindir}/fslsfonts