#
%define _sver %(echo %{version} | tr -d .)
-%define _synaptics_ver 0.11.4
+%define _synaptics_ver 0.11.8
Summary: XFree86 Window System servers and basic programs
Summary(de): XFree86 Window-System-Server und grundlegende Programme
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.3.99.13
-Release: 0.2
+Version: 4.3.99.15
+Release: 0.1
+Epoch: 1
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 908b6c8b7ba2d52e54565c2f728fdfff
+# Source0-md5: ae7ec191348888bc9f83318e55a009e1
#Source1: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz
#Source2: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz
Source3: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source38-md5: a184106bb83cb27c6963944d9243ac3f
#Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
# http://w1.894.telia.com/~u89404340/touchpad/index.html
-Source40: http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
-# Source40-md5: c07ffb03e93aefebc0570fe638939e27
+Source40: http://w1.894.telia.com/~u89404340/touchpad/files/synaptics-%{_synaptics_ver}.tar.bz2
+# Source40-md5: 48c6e9abc68672d5167f1b699b89005e
Source41: http://www.linux.org.uk/~alan/S3.zip
# Source41-md5: 8b754fc6bbded60b683563b945e384b0
Source42: twm-xsession.desktop
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-
+Patch25: %{name}-xterm-fix.patch
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch46: %{name}-lock.patch
Patch47: %{name}-linux-version.patch
Patch48: %{name}-new-s3-nodebug.patch
-Patch49: %{name}-genauth.patch
+Patch49: %{name}-mandir-fix.patch
+Patch50: %{name}-xterm-256colors.patch
URL: http://www.xfree86.org/
BuildRequires: %{_bindir}/perl
BuildRequires: bison
%ifarch %{ix86}
%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
%endif
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Requires: xauth
Requires: pam >= 0.77.3
ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
Summary: Header files for Display PostScript
Summary(pl): Pliki nag³ówkowe dla Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS = %{version}
+Requires: %{name}-DPS = %{epoch}:%{version}
Obsoletes: dgs-devel
%description DPS-devel
Summary: Display PostScript static libraries
Summary(pl): Biblioteki statyczne Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS-devel = %{version}
+Requires: %{name}-DPS-devel = %{epoch}:%{version}
Obsoletes: dgs-static
%description DPS-static
Summary: OpenGL support for X11R6
Summary(pl): Wsparcie OpenGL dla systemu X11R6
Group: X11/Libraries
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Requires: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
Summary: OpenGL support for X11R6 - GL library
Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
Group: X11/Libraries
-Requires: XFree86-OpenGL-core = %{version}
+Requires: XFree86-OpenGL-core = %{epoch}:%{version}
Obsoletes: XFree86-driver-firegl
Conflicts: OpenGL-core < 4.3.99.12
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
Group: X11/Development/Libraries
Requires: OpenGL-devel-base
-Requires: %{name}-OpenGL-libs = %{version}
+Requires: %{name}-OpenGL-libs = %{epoch}:%{version}
Requires: %{name}-devel
Provides: OpenGL-devel
Obsoletes: Mesa-devel
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h)
Group: X11/Development/Libraries
Requires: OpenGL-devel
-Requires: %{name}-OpenGL-libs = %{version}
+Requires: %{name}-OpenGL-libs = %{epoch}:%{version}
Requires: %{name}-devel
Provides: OpenGL-devel-base
Summary(pl): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
Requires: %{name}-OpenGL-core
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Provides: OpenGL
Obsoletes: %{name}-OpenGL
Obsoletes: Mesa
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
-Requires: %{name}-OpenGL-devel = %{version}
+Requires: %{name}-OpenGL-devel = %{epoch}:%{version}
Provides: OpenGL-static
Obsoletes: Mesa-static
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-fonts-base
%description Xnest
Group: X11/XFree86/Servers
PreReq: xprint-initrc
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-fonts-base
%description Xprt
Summary(tr): XFree86 sunucusu
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-fonts-base
Requires: pam
Obsoletes: XFree86-Mono
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/XFree86/Servers
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-fonts-base
%description Xvfb
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-libs = %{version}
-Requires: imake = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
+Requires: imake = %{epoch}:%{version}
Provides: xpm-devel
Obsoletes: xpm-devel
%ifarch sparc sparc64
Summary: Header files for XFree86 Xserver drivers/extensions development
Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{epoch}:%{version}
%description Xserver-devel
Header files for XFree86 Xserver drivers and extensions development.
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Alliance
%description driver-apm
Summary: Ark Logic video driver
Summary(pl): Sterownik do kart Ark Logic
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-ark
Ark Logic driver.
Summary: ATI video driver
Summary(pl): Sterownik do kart ATI
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
Obsoletes: XFree86-Mach32
Obsoletes: XFree86-Mach64
Summary(pl): Sterownik do kart ATI Rage 128
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati
Conflicts: XFree86-driver-nvidia
Summary: ATI video driver (ATI.2)
Summary(pl): Sterownik do kart ATI (ATI.2)
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
Obsoletes: XFree86-Mach32
Obsoletes: XFree86-Mach64
Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2)
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary(pl): Sterownik do kart ATI Radeon (ATI.2)
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ChipsTechnologies
%description driver-chips
Summary: Cirrus Logic video driver
Summary(pl): Sterownik do kart Cirrus Logic
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Cirrus
%description driver-cirrus
Summary: Cyrix video driver
Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Cyrix
%description driver-cyrix
Summary: Video driver for framebuffer device
Summary(pl): Sterownik korzystaj±cy z framebuffera
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-FBDev
%description driver-fbdev
Summary: Video driver for DRI sparc framebuffer device
Summary(pl): Sterownik do framebuffera DRI na sparc
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-ffb
Video driver for DRI sparc framebuffer device.
Summary: 3Dfx Voodoo1 and Voodoo2 video driver
Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Summary(pl): Sterownik do kart GLINT i Permedia
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3DLabs
Summary: Number 9 I128 video driver
Summary(pl): Sterownik do kart Number 9 I128
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-I128
%description driver-i128
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-i740
%description driver-i740
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-i810
Summary: Integrated Micro Solutions Twin Turbo 128 driver
Summary(pl): Sterownik do kart Integrated Micro Solutions Twin Turbo 128
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-imstt
Integrated Micro Solutions Twin Turbo 128 driver.
Summary(pl): Sterownik do kart Matrox
Group: X11/XFree86
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-mga
Summary: NeoMagic video driver
Summary(pl): Sterownik do kart NeoMagic
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-NeoMagic
%description driver-neomagic
Summary: Newport (XL) adapters video driver
Summary(pl): Sterownik do kart Newport (XL)
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-newport
Newport (XL) adapters video driver (found primarily in SGI Indy and
Summary: National Semiconductors GEODE family video driver
Summary(pl): Sterownik dla kart na uk³adach z rodziny GEODE firmy National Semiconductors
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-nsc
National Semiconductors GEODE family video driver. Supports GXLV (5530
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-NVidia
%description driver-nv
Summary: Rendition video driver
Summary(pl): Sterownik do kart Rendition
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Rendition
%description driver-rendition
Summary: S3 ViRGE/Trio3D video driver
Summary(pl): Sterownik do kart na uk³adach S3 ViRGE i Trio3D
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-S3V
%description driver-s3virge
Summary: S3 Trio video driver
Summary(pl): Sterownik do kart na uk³adach S3 Trio
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-S3
%description driver-s3
Summary: S3 Savage video driver
Summary(pl): Sterownik do kart na uk³adach S3 Savage
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-savage
S3 Savage video driver.
Summary: Silicon Motion video driver
Summary(pl): Sterownik do kart na uk³adach Silicon Motion
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-siliconmotion
Silicon Motion video driver.
Summary: SiS video driver
Summary(pl): Sterownik do kart na uk³adach SiS
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-SiS
%description driver-sis
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-SunMono
%description driver-sunbw2
Summary: suncg14 - Sun CG14 video driver
Summary(pl): Sterownik do kolorowego framebuffera CG14 na Sunie
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-suncg14
suncg14 - Sun CG14 video driver.
Summary: suncg3 - Sun CG3 video cards driver
Summary(pl): Sterownik do kolorowego framebuffera CG3 na Sunie
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-suncg3
suncg3 - Sun CG3 video cards driver.
Summary: suncg6 - Sun GX and Turbo GX video driver
Summary(pl): Sterownik do grafiki GX i Turbo GX na Sunie
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-suncg6
suncg6 - Sun GX and Turbo GX video driver.
Summary: sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver
Summary(pl): Sterownik do kart Sun Creator, Creator 3D, Elite 3D
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-sunffb
sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
Summary: sunleo - Sun Leo (ZX) video cards driver
Summary(pl): Sterownik do kart Sun Leo (ZX)
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-sunleo
sunleo - Sun Leo (ZX) video cards driver.
Summary: suntcx - Sun TCX video cards driver
Summary(pl): Sterownik do kart Sun TCX
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-suntcx
suntcx - Sun TCX video cards driver.
Group: X11/XFree86
Requires: Glide3-DRI
Requires: OpenGL
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3dfx
Summary: TGA video driver
Summary(pl): Sterownik do kart TGA
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-TGA
%description driver-tga
Summary: Trident video driver
Summary(pl): Sterownik do kart Trident
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Trident
%description driver-trident
Summary: Tseng Labs video driver
Summary(pl): Sterownik do kart Tseng Labs
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Tseng XFree86-W32
%description driver-tseng
Summary: VIA CLE266 driver
Summary(pl): Sterownik do kart VIA CLE266
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-via
VIA CLE266 driver.
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-vmware
VMware emulated SVGA video driver. Necessary if you run Linux on
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): grep
Requires(postun): fileutils
-Requires: %{name}-common = %{version}
+Requires: %{name}-common = %{epoch}:%{version}
Provides: xpm
Obsoletes: xpm
Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}
+Requires: %{name}-Xserver = %{epoch}:%{version}
Obsoletes: XFree86-xf86cfg
%description setup
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-devel = %{version}
+Requires: %{name}-devel = %{epoch}:%{version}
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
Group: X11/XFree86
Requires: %{name} >= %{version}
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Requires: man-config
Obsoletes: X11R6-contrib
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
%description -n twm
Twm is a window manager for the X Window System. It provides
Summary: xauth - X authority file utility
Summary(pl): xauth - narzêdzie do plików X authority
Group: X11/XFree86
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
%description -n xauth
The xauth program is used to edit and display the authorization
Group: X11/XFree86
PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
-Requires: %{name} = %{version}
-Requires: %{name}-libs = %{version}
+Requires: %{name} = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Requires: /usr/X11R6/bin/sessreg
Requires: pam >= 0.71
-Requires: sessreg = %{version}
+Requires: sessreg = %{epoch}:%{version}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
Obsoletes: XFree86-xdm
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires: %{name}-fonts-base
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}
Obsoletes: xfsft XFree86-xfs
%description -n xfs
%patch22 -p1
%patch23 -p1
%patch24 -p1
-
+%patch25 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
%patch47 -p1
tar xfz *.tar.gz
%patch48 -p0
-%patch49 -p0
+%patch49 -p1
+%patch50 -p1
rm -f xc/config/cf/host.def
%ifarch %{ix86} mips ppc arm
olddir=$(pwd)
cd LinuxDriver/2D
-sed -i -e 's#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g' Imakefile
+chmod u+w Imakefile
+echo -e ',s#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g\n,w' | ed Imakefile
xmkmf $olddir/xc .
%{__make} -S savage_drv.o \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+ $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \
$RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \
- $RPM_BUILD_ROOT%{_datadir}/{misc,xsessions} \
+ $RPM_BUILD_ROOT%{_datadir}/misc \
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
%{_libdir}/X11/app-defaults/XCalc-color
%{_libdir}/X11/app-defaults/XClipboard
%{_libdir}/X11/app-defaults/XClock
+%{_libdir}/X11/app-defaults/XClock-color
%{_libdir}/X11/app-defaults/XLoad
%{_libdir}/X11/app-defaults/XLogo
%{_libdir}/X11/app-defaults/XLogo-color
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/glxinfo
%attr(755,root,root) %{_libdir}/libGLU.so.*.*
+# to be fixed: it contains unresolved symbols and would need -lXm
+#%attr(755,root,root) %{_libdir}/libGLw.so.*.*
%attr(755,root,root) %{_libdir}/libOSMesa.so.*.*
%{_mandir}/man1/glxinfo.1*
%defattr(644,root,root,755)
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/XFree86
+%attr(755,root,root) %{_bindir}/getconfig*
%attr(755,root,root) %{_sysconfdir}/X11/X
%attr(755,root,root) %{_bindir}/X
%{_mandir}/man1/XFree86.1*
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
-%attr(755,root,root) %{_libdir}/libXfont*.so
-%attr(755,root,root) %{_libdir}/libI*.so
-%attr(755,root,root) %{_libdir}/libS*.so
-%attr(755,root,root) %{_libdir}/libx*.so
+%attr(755,root,root) %{_libdir}/libFS.so
+%attr(755,root,root) %{_libdir}/libI810XvMC.so
+%attr(755,root,root) %{_libdir}/libICE.so
+%attr(755,root,root) %{_libdir}/libSM.so
+%attr(755,root,root) %{_libdir}/libX11.so
+%attr(755,root,root) %{_libdir}/libXRes.so
+%attr(755,root,root) %{_libdir}/libXTrap.so
+%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXext.so
+%attr(755,root,root) %{_libdir}/libXfont.so
+%attr(755,root,root) %{_libdir}/libXfontcache.so
+%attr(755,root,root) %{_libdir}/libXi.so
+%attr(755,root,root) %{_libdir}/libXinerama.so
+%attr(755,root,root) %{_libdir}/libXmu.so
+%attr(755,root,root) %{_libdir}/libXmuu.so
+%attr(755,root,root) %{_libdir}/libXp.so
+%attr(755,root,root) %{_libdir}/libXpm.so
+%attr(755,root,root) %{_libdir}/libXrandr.so
+%attr(755,root,root) %{_libdir}/libXss.so
+%attr(755,root,root) %{_libdir}/libXt.so
+%attr(755,root,root) %{_libdir}/libXtst.so
%attr(755,root,root) %{_libdir}/libXv.so
-%{_libdir}/libfntstubs.a
-%{_libdir}/libfontenc.a
-%{_libdir}/libFS.a
-%{_libdir}/libI810XvMC.a
-%{_libdir}/liboldX.a
+%attr(755,root,root) %{_libdir}/libXvMC.so
+%attr(755,root,root) %{_libdir}/libXxf86dga.so
+%attr(755,root,root) %{_libdir}/libXxf86misc.so
+%attr(755,root,root) %{_libdir}/libXxf86rush.so
+%attr(755,root,root) %{_libdir}/libXxf86vm.so
+%attr(755,root,root) %{_libdir}/libfontenc.so
+%attr(755,root,root) %{_libdir}/libxkbfile.so
+%attr(755,root,root) %{_libdir}/libxkbui.so
+%attr(755,root,root) %{_libdir}/libxrx.so
%{_libdir}/libXau.a
%{_libdir}/libXdmcp.a
+%{_libdir}/libfntstubs.a
+%{_libdir}/liboldX.a
%{_libdir}/libxf86config.a
-%{_libdir}/libXfontcache.a
-%{_libdir}/libXinerama.a
-%{_libdir}/libxkbfile.a
-%{_libdir}/libxkbui.a
-%{_libdir}/libXrandr.a
-%{_libdir}/libXss.a
-%{_libdir}/libXTrap.a
-%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
-%{_libdir}/libXxf86dga.a
-%{_libdir}/libXxf86misc.a
-%{_libdir}/libXxf86rush.a
-%{_libdir}/libXxf86vm.a
%{_includedir}/X11/*.h
%{_includedir}/X11/ICE
%{_includedir}/X11/PM
%{_includedir}/X11/Xaw
%{_includedir}/X11/Xmu
%dir %{_includedir}/X11/extensions
-%{_includedir}/X11/extensions/[^X]*.h
-%{_includedir}/X11/extensions/X[^I]*.h
-%{_includedir}/X11/extensions/XI.h
-%{_includedir}/X11/extensions/XI[^E]*.h
+%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libdir}/X11/config
%exclude %{_includedir}/X11/extensions/Xrender.h
%exclude %{_includedir}/X11/extensions/render.h
%exclude %{_includedir}/X11/extensions/renderproto.h
-%exclude %{_libdir}/libXrender.so
-%exclude %{_libdir}/libXcursor.so
-%{_mandir}/man3/[A-EH-Z]*
+%{_mandir}/man3/[A-FH-Z]*
%exclude %{_mandir}/man3/Xft.3*
%files Xserver-devel
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm
+%ifarch %{ix86} mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
%ifarch %{ix86}
-#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
+%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
%{_mandir}/man4/sis*
%endif
%{_mandir}/man4/suntcx*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm
+%ifarch %{ix86} sparc sparc64 mips alpha arm ppc
%{!?_without_tdfx:%files driver-tdfx}
%{!?_without_tdfx:%defattr(644,root,root,755)}
%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o}
-%ifarch %{ix86} alpha arm
+%ifarch %{ix86} alpha arm ppc
%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
%endif
%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%files libs -f XFree86-libs.lang
%defattr(644,root,root,755)
-%dir %{_sysconfdir}/xdg
+%dir /etc/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
-%dir %{_datadir}/xsessions
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
%dir %{_wmpropsdir}
-%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so.*.*
-%attr(755,root,root) %{_libdir}/libXfont*.so.*.*
-%attr(755,root,root) %{_libdir}/libI*.so.*.*
-%attr(755,root,root) %{_libdir}/libS*.so.*.*
-%attr(755,root,root) %{_libdir}/libx*.so.*.*
+%dir %{_xsessdir}
+%attr(755,root,root) %{_libdir}/libFS.so.*.*
+%attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
+%attr(755,root,root) %{_libdir}/libICE.so.*.*
+%attr(755,root,root) %{_libdir}/libSM.so.*.*
+%attr(755,root,root) %{_libdir}/libX11.so.*.*
+%attr(755,root,root) %{_libdir}/libXRes.so.*.*
+%attr(755,root,root) %{_libdir}/libXTrap.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw.so.*.*
+%attr(755,root,root) %{_libdir}/libXext.so.*.*
+%attr(755,root,root) %{_libdir}/libXfont.so.*.*
+%attr(755,root,root) %{_libdir}/libXfontcache.so.*.*
+%attr(755,root,root) %{_libdir}/libXi.so.*.*
+%attr(755,root,root) %{_libdir}/libXinerama.so.*.*
+%attr(755,root,root) %{_libdir}/libXmu.so.*.*
+%attr(755,root,root) %{_libdir}/libXmuu.so.*.*
+%attr(755,root,root) %{_libdir}/libXp.so.*.*
+%attr(755,root,root) %{_libdir}/libXpm.so.*.*
+%attr(755,root,root) %{_libdir}/libXrandr.so.*.*
+%attr(755,root,root) %{_libdir}/libXss.so.*.*
+%attr(755,root,root) %{_libdir}/libXt.so.*.*
+%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%attr(755,root,root) %{_libdir}/libXv.so.*.*
-
-%exclude %{_libdir}/libXrender.so.*.*
-%exclude %{_libdir}/libXcursor.so.*.*
+%attr(755,root,root) %{_libdir}/libXvMC.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86dga.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.*
+%attr(755,root,root) %{_libdir}/libXxf86vm.so.*.*
+%attr(755,root,root) %{_libdir}/libfontenc.so.*.*
+%attr(755,root,root) %{_libdir}/libxkbfile.so.*.*
+%attr(755,root,root) %{_libdir}/libxkbui.so.*.*
+%attr(755,root,root) %{_libdir}/libxrx.so.*.*
%files modules
%defattr(644,root,root,755)
%files static
%defattr(644,root,root,755)
+%{_libdir}/libFS.a
+%{_libdir}/libI810XvMC.a
%{_libdir}/libICE.a
%{_libdir}/libSM.a
%{_libdir}/libX11.a
%{_libdir}/libXRes.a
+%{_libdir}/libXTrap.a
%{_libdir}/libXaw.a
%{_libdir}/libXext.a
%{_libdir}/libXfont.a
+%{_libdir}/libXfontcache.a
%{_libdir}/libXi.a
+%{_libdir}/libXinerama.a
%{_libdir}/libXmu.a
%{_libdir}/libXmuu.a
%{_libdir}/libXp.a
%{_libdir}/libXpm.a
+%{_libdir}/libXrandr.a
+%{_libdir}/libXss.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
+%{_libdir}/libXv.a
+%{_libdir}/libXvMC.a
+%{_libdir}/libXxf86dga.a
+%{_libdir}/libXxf86misc.a
+%{_libdir}/libXxf86rush.a
+%{_libdir}/libXxf86vm.a
+%{_libdir}/libfontenc.a
+%{_libdir}/libxkbfile.a
+%{_libdir}/libxkbui.a
%files tools
%defattr(644,root,root,755)
projects / packages / XFree86.git / blobdiff