# - separate XFS to be standalone - is it possible without duplicated files?
#
# Conditional build:
-%bcond_without tdfx # disables tdfx drivers building
+%bcond_without glide # don't build glide driver
#
Summary: XOrg X11 Window System servers and basic programs
Summary(de): XOrg X11 Window-System-Server und grundlegende Programme
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
Version: 6.7.0
-Release: 2
+Release: 6
Epoch: 1
License: XFree86 1.0 (?)
Group: X11/Xorg
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: bf9b05a66798796b53ed1a050049b2ee
+# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
Patch0: %{name}-PLD.patch
Patch1: XFree86-HasZlib.patch
Patch2: XFree86-DisableDebug.patch
Patch52: XFree86-kernel_headers.patch
Patch53: XFree86-stdint.patch
Patch54: %{name}-setxkbmap.patch
+Patch55: %{name}-makefile-fastbuild.patch
URL: http://www.x.org/
BuildRequires: /usr/bin/perl
-%ifarch %{ix86} alpha amd64
-%{?with_tdfx:BuildRequires: Glide3-DRI-devel}
-%endif
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86} amd64
-%{?with_tdfx:BuildRequires: Glide2x_SDK}
+%ifarch %{ix86} amd64 ia64
+%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: xauth
Requires: pam >= 0.77.3
Provides: XFree86 = %{epoch}:%{version}-%{release}
Obsoletes: xpm-progs
Obsoletes: xterm
+Obsoletes: XFree86
%ifarch sparc sparc64
Obsoletes: X11R6.1
%endif
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
+ExclusiveArch: %{ix86} alpha amd64 armv4l ia64 m68k ppc sparc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%define _soundsdir /usr/share/sounds
+%define _wallpapersdir /usr/share/wallpapers
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
Summary(pl): Pliki XOrg X11 wymagane zarówno po stronie serwera jak i klienta
Group: X11/Xorg
Provides: XFree86-common = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-common
%description common
XOrg X11 files required both on server and client side.
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
Provides: XFree86-DPS = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS
Obsoletes: dgs
%description DPS
Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: XFree86-DPS-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-devel
Obsoletes: dgs-devel
%description DPS-devel
Group: X11/Xorg
Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
Provides: XFree86-DPS-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-static
Obsoletes: dgs-static
%description DPS-static
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: X11-OpenGL-libGL
Provides: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-core
%description OpenGL-core
OpenGL support for X11R6 system.
Group: XFree86/Libraries
Requires: X11-OpenGL-core = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-libGL
Obsoletes: X11-driver-firegl
+Obsoletes: X11-driver-nvidia
%description OpenGL-libGL
OpenGL support for X11R6 system - GL library.
Requires: OpenGL-devel-base
Provides: OpenGL-devel
Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-devel
Obsoletes: Mesa-devel
Obsoletes: glxMesa-devel
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-devel-base
Provides: XFree86-OpenGL-devel-base = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-devel-base
+Obsoletes: X11-driver-nvidia-devel
%description OpenGL-devel-base
Base headers (GL and GLX only) for OpenGL for X11R6.
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: OpenGL
Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-libs
Obsoletes: Mesa
%description OpenGL-libs
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-static
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-static
Obsoletes: Mesa-static
%description OpenGL-static
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: X11-fonts-base
Provides: XFree86-Xnest = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xnest
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: X11-fonts-base
+Provides: XFree86-Xprt = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xprt
%description Xprt
Xprt provides an X server with the print extension and special DDX
Requires: X11-fonts-base
Requires: pam
Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xserver
Obsoletes: X11-Mono
Obsoletes: X11-SVGA
Obsoletes: X11-VGA16
Summary(ru): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/Xorg/Servers
+Provides: XFree86-Xvfb = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xvfb
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: imake = %{epoch}:%{version}-%{release}
+Requires: fontconfig-devel >= 1:2.2.0
Provides: XFree86-devel = %{epoch}:%{version}-%{release}
Provides: render
Provides: xcursor-devel
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
+Obsoletes: XFree86-devel
Obsoletes: render
Obsoletes: xcursor-devel
Obsoletes: xft-devel
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: XFree86-Xserver-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xserver-devel
%description Xserver-devel
Header files for XOrg X11 Xserver drivers and extensions development.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-apm
%description driver-apm
Alliance Promotion driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ark
%description driver-ark
Ark Logic driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ati
%description driver-ati
ATI video driver.
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-r128
%description driver-r128
ATI Rage 128 video driver.
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-radeon
%description driver-radeon
ATI Radeon video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-chips
%description driver-chips
Chips and Technologies video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-cirrus
%description driver-cirrus
Cirrus Logic video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-cyrix
%description driver-cyrix
Cyrix video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-fbdev
%description driver-fbdev
Non-accelerated video driver for framebuffer device.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ffb
%description driver-ffb
Video driver for DRI sparc framebuffer device.
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
# dlopens libglide2x.so
Requires: Glide_VG
+Obsoletes: XFree86-driver-glide
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-glint
%description driver-glint
GLINT/Permedia video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-i128
%description driver-i128
Number 9 I128 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-i740
%description driver-i740
Intel i740 video driver.
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-i810
%description driver-i810
Intel i810/i815/i830 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-imstt
%description driver-imstt
Integrated Micro Solutions Twin Turbo 128 driver.
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-mga
%description driver-mga
Matrox video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-neomagic
%description driver-neomagic
NeoMagic video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-newport
%description driver-newport
Newport (XL) adapters video driver (found primarily in SGI Indy and
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-nsc
%description driver-nsc
National Semiconductors GEODE family video driver. Supports GXLV (5530
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-nv
%description driver-nv
nVidia video driver. Supports Riva128, RivaTNT, GeForce.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-rendition
%description driver-rendition
Rendition/Micron video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-s3virge
%description driver-s3virge
S3 ViRGE/Trio3D video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-s3
%description driver-s3
S3 Trio video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-savage
%description driver-savage
S3 Savage video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-siliconmotion
%description driver-siliconmotion
Silicon Motion video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sis
%description driver-sis
SiS video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunbw2
%description driver-sunbw2
sunbw2 - Sun BW2 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg14
%description driver-suncg14
suncg14 - Sun CG14 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg3
%description driver-suncg3
suncg3 - Sun CG3 video cards driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg6
%description driver-suncg6
suncg6 - Sun GX and Turbo GX video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunffb
%description driver-sunffb
sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunleo
%description driver-sunleo
sunleo - Sun Leo (ZX) video cards driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suntcx
%description driver-suntcx
suntcx - Sun TCX video cards driver.
Requires: Glide3-DRI
Requires: OpenGL
Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-tdfx
%description driver-tdfx
3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-tga
%description driver-tga
TGA video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-trident
%description driver-trident
Trident video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-tseng
%description driver-tseng
Tseng Labs video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-via
%description driver-via
VIA CLE266 driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-vmware
%description driver-vmware
VMware emulated SVGA video driver. Necessary if you run Linux on
Provides: xft
Provides: xpm
Provides: xrender
+Obsoletes: XFree86-libs
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
%endif
Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
Group: X11/Xorg
Provides: XFree86-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-modules
%description modules
Modules with X servers extensions.
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XOrg X11
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Provides: XFree86-setup = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-setup
Obsoletes: X11-xf86cfg
%description setup
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: XFree86-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-static
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
Provides: XFree86-tools = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-tools
Obsoletes: X11R6-contrib
%description tools
Summary: Cursors Theme "handhelds"
Summary(pl): Motyw kursorów "handhelds"
Group: X11/Themes
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-handhelds
Cursors theme "handhelds" for X11.
Summary: Cursors theme "redglass"
Summary(pl): Motyw kursorów "redglass"
Group: X11/Themes
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-redglass
Cursors theme "redglass" for X11.
Summary: Cursors theme "whiteglass"
Summary(pl): Motyw kursorów "whiteglass"
Group: X11/Themes
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-whiteglass
Cursors theme "whiteglass" for X11.
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Group: Development/Building
Provides: imake = %{epoch}:%{version}-%{release}
+Obsoletes: imake
%description imake
Imake is used to generate Makefiles from a template, a set of cpp
Summary(pl): Program do zarz±dzania wpisami w utmp/wtmp
Group: X11/Xorg
Provides: sessreg = %{epoch}:%{version}-%{release}
+Obsoletes: sessreg
%description sessreg
sessreg is a simple program for managing utmp/wtmp entries for xdm
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Provides: twm
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: twm = %{epoch}:%{version}-%{release}
+Obsoletes: twm
%description twm
Twm is a window manager for the X Window System. It provides
Group: X11/Xorg
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: xauth = %{epoch}:%{version}-%{release}
+Obsoletes: xauth
%description xauth
The xauth program is used to edit and display the authorization
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
Provides: xdm = %{epoch}:%{version}-%{release}
+Obsoletes: xdm
Obsoletes: gdm
%description xdm
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: X11-fonts-base
Provides: xfs = %{epoch}:%{version}-%{release}
+Obsoletes: xfs
Obsoletes: xfsft
%description xfs
ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
X11-libs.
-#--- %prep ---------------------------
-
%prep
%setup -qc -a1 -a2 -a7
%patch0 -p0
%patch33 -p1
#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
-%{?with_tdfx:%patch36 -p0}
+%patch36 -p0
#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%{?with_tdfx:%patch39 -p0}
+%patch39 -p0
%patch40 -p1
%{!?debug:%patch41 -p1}
-%{!?with_tdfx:%patch42 -p0}
+%{!?with_glide:%patch42 -p0}
%patch43 -p0
%patch44 -p0
%patch45 -p1
%patch52 -p1
%patch53 -p0
%patch54 -p1
+%patch55 -p0
rm -f xc/config/cf/host.def
%build
%{__make} -S -C xc World \
+ FAST=1 \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
CC="%{__cc}" \
BOOTSTRAPCFLAGS="%{rpmcflags}" \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
$RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
- $RPM_BUILD_ROOT%{_xsessdir} \
+ $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir}} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
%{__make} -C xc install install.man \
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%{_mandir}/man1/atobm.1*
-%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man1/bitmap.1*
%{_mandir}/man1/bmtoa.1*
%{_mandir}/man1/cxpm.1*
%attr(755,root,root) %{_libdir}/libdps.so.*.*
%attr(755,root,root) %{_libdir}/libdpstk.so.*.*
%attr(755,root,root) %{_libdir}/libpsres.so.*.*
-%{_mandir}/man1/makepsres*
-%{_mandir}/man1/pswrap*
-%{_mandir}/man1/dpsexec*
-%{_mandir}/man1/dpsinfo*
+%{_mandir}/man1/makepsres.1*
+%{_mandir}/man1/pswrap.1*
+%{_mandir}/man1/dpsexec.1*
+%{_mandir}/man1/dpsinfo.1*
%files DPS-devel
%defattr(644,root,root,755)
# Linux OpenGL ABI compatibility symlink
%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
%{_mandir}/man1/glxinfo.1*
-%{_mandir}/man1/glxgears.1x*
+%{_mandir}/man1/glxgears.1*
%files OpenGL-static
%defattr(644,root,root,755)
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
+%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man3/[A-FH-Z]*
%{_pkgconfigdir}/xcursor.pc
%{_pkgconfigdir}/xft.pc
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
-%{_mandir}/man4/apm*
+%{_mandir}/man4/apm.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
-%{_mandir}/man4/chips*
+%{_mandir}/man4/chips.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
-%{_mandir}/man4/cirrus*
+%{_mandir}/man4/cirrus.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
-%{_mandir}/man4/cyrix*
+%{_mandir}/man4/cyrix.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
%{_mandir}/man4/fbdev.4*
%endif
-%ifarch %{ix86}
-%if %{with tdfx}
+%ifarch %{ix86} ia64
+%if %{with glide}
%files driver-glide
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{_mandir}/man4/glide.4*
%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
-%{_mandir}/man4/glint*
+%{_mandir}/man4/glint.4*
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
-%{_mandir}/man4/i128*
+%{_mandir}/man4/i128.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i740
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
-%{_mandir}/man4/i740*
+%{_mandir}/man4/i740.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
+# i810_dri alone is built on amd64 - what for?
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
-%{_mandir}/man4/i810*
+%{_mandir}/man4/i810.4*
%endif
# Devel: %{ix86} sparc sparc64 ppc amd64
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha ppc arm
%files driver-mga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
-%{_mandir}/man4/mga*
+%{_mandir}/man4/mga.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
-%{_mandir}/man4/neomagic*
+%{_mandir}/man4/neomagic.4*
%endif
# Devel: %{ix86} sparc sparc64 amd64
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm ppc amd64
+%ifarch %{ix86} ia64 amd64 mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
-%{_mandir}/man4/nv*
+%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
-%{_mandir}/man4/r128*
+%{_mandir}/man4/r128.4*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
-%{_mandir}/man4/radeon*
+%{_mandir}/man4/radeon.4*
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%{_libdir}/modules/*.uc
-%{_mandir}/man4/rendition*
+%{_mandir}/man4/rendition.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-s3virge
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
-%{_mandir}/man4/s3virge*
+%{_mandir}/man4/s3virge.4*
%endif
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-savage
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
-%{_mandir}/man4/savage*
+%{_mandir}/man4/savage.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
-%{_mandir}/man4/siliconmotion*
+%{_mandir}/man4/siliconmotion.4*
%endif
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-sis
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
-%{_mandir}/man4/sis*
+%{_mandir}/man4/sis.4*
%endif
%ifarch sparc sparc64
%files driver-sunbw2
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
-%{_mandir}/man4/sunbw2*
+%{_mandir}/man4/sunbw2.4*
%endif
%ifarch sparc sparc64
%files driver-suncg14
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
-%{_mandir}/man4/suncg14*
+%{_mandir}/man4/suncg14.4*
%endif
%ifarch sparc sparc64
%files driver-suncg3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
-%{_mandir}/man4/suncg3*
+%{_mandir}/man4/suncg3.4*
%endif
%ifarch sparc sparc64
%files driver-suncg6
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
-%{_mandir}/man4/suncg6*
+%{_mandir}/man4/suncg6.4*
%endif
%ifarch sparc sparc64
%files driver-sunffb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+# Devel: %{ix86} ia64 (for fun?)
%attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
-%{_mandir}/man4/sunffb*
+%{_mandir}/man4/sunffb.4*
%endif
%ifarch sparc sparc64
%files driver-sunleo
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
-%{_mandir}/man4/sunleo*
+%{_mandir}/man4/sunleo.4*
%endif
%ifarch sparc sparc64
%files driver-suntcx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
-%{_mandir}/man4/suntcx*
+%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
-%if %{with tdfx}
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha arm ppc
%files driver-tdfx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%ifarch %{ix86} alpha arm ppc
+%ifarch %{ix86} ia64 alpha arm ppc
%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
%endif
-%{_mandir}/man4/tdfx*
-%endif
+%{_mandir}/man4/tdfx.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
-%{_mandir}/man4/trident*
+%{_mandir}/man4/trident.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
-%{_mandir}/man4/tseng*
+%{_mandir}/man4/tseng.4*
%endif
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-via
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-vmware
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
-%{_mandir}/man4/vmware*
+%{_mandir}/man4/vmware.4*
%endif
%files libs
%lang(sk) %dir %{_appdefsdir}/sk
%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
-%{_libx11dir}/locale
+%dir %{_libx11dir}/locale
+%{_libx11dir}/locale/[!l]*
+%{_libx11dir}/locale/locale.*
+%dir %{_libx11dir}/locale/%{_lib}
+%dir %{_libx11dir}/locale/%{_lib}/common
+%attr(755,root,root) %{_libx11dir}/locale/%{_lib}/common/*.so*
%dir %{_includedir}
%dir %{_includedir}/X11
/usr/include/X11
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
+%dir %{_wallpapersdir}
%dir %{_wmpropsdir}
%dir %{_xsessdir}
%attr(755,root,root) %{_libdir}/libFS.so.*.*
%ifnarch amd64
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
%endif
-%ifarch %{ix86} sparc sparc64 amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/aiptek.4*
-%{_mandir}/man4/citron*
+%{_mandir}/man4/citron.4*
%{_mandir}/man4/dmc.4*
-%{_mandir}/man4/dynapro*
+%{_mandir}/man4/dynapro.4*
+%{_mandir}/man4/elographics.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard*
-%{_mandir}/man4/microtouch*
+%{_mandir}/man4/keyboard.4*
+%{_mandir}/man4/microtouch.4*
%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/mutouch.4*
%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
%ifnarch amd64
-%{_mandir}/man4/v4l*
+%{_mandir}/man4/v4l.4*
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
-%{_mandir}/man4/vga*
+%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} sparc sparc64 amd64
-%{_mandir}/man4/vesa*
+%ifarch %{ix86} ia64 amd64 sparc sparc64
+%{_mandir}/man4/vesa.4*
%endif
-%{_mandir}/man4/void*
-%{_mandir}/man4/wacom*
-%{_mandir}/man4/elographics*
-%{_mandir}/man4/mutouch*
+%{_mandir}/man4/void.4*
+%{_mandir}/man4/wacom.4*
%files setup
%defattr(644,root,root,755)