# TODO:
-# - update and fix tdfx patchs
-# - cleanups
-# - man4/mouse from modules conflicts with man4/mouse from man-pages
-# - add missing files
-
-# _without_tdfx disables tdfx build
-
-%define _sver %(echo %{version} | tr -d .)
+# - separate XFS to be standalone - is it possible without duplicated files?
+#
+# Conditional build:
+%bcond_without tdfx # disables tdfx drivers building
+#
Summary: XFree86 Window System servers and basic programs
-Summary(de): Xfree86 Window-System-Server und grundlegende Programme
+Summary(de): XFree86 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86
Summary(fr): Serveurs du système XFree86 et programmes de base
Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.2.99.3
-Release: 0.20030109.2
+Version: 4.3.99.902
+Release: 4
+Epoch: 1
License: MIT
Group: X11/XFree86
-#Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
-Source0: X42993src-1-20030109.tar.bz2
-Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
-Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
-Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
+# Source0-md5: eec2d5e4b980ec73a7772b9362ed9021
+#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
+# Source3-md5: 0a15b1c374256b5cad7961807baa3896
Source4: xdm.pamd
Source5: xserver.pamd
Source6: xdm.init
Source35: xclock.png
Source36: oclock.png
Source37: xconsole.png
-Source38: http://www.winischhofer/sis/sis_drv_src_141202-1.tar.gz
+Source38: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+# Source38-md5: a184106bb83cb27c6963944d9243ac3f
+#Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
+Source40: %{name}-Xserver-headers
+Source41: %{name}-Xserver-headers-links
+Source42: twm-xsession.desktop
+Source43: xcalc.desktop
+Source44: xload.desktop
+Source45: xmag.desktop
+Source46: xcalc.png
+Source47: xload.png
+Source48: xmag.png
+Source49: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+# NoSource49-md5: bf9b05a66798796b53ed1a050049b2ee
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.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}-XTerm.ad.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}-xman-manpaths.patch
-Patch35: %{name}-ppc_drivers.patch
-Patch36: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
-Patch37: %{name}-clearrts.patch
-Patch38: %{name}-mga020414.patch
-Patch39: %{name}-trident-9397.patch
-Patch40: %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
-Patch41: %{name}-nv020414.patch
-Patch42: %{name}-fix-07-s3trio64v2gx+netfinity.patch
-Patch43: %{name}-prosavage.patch
-Patch44: %{name}-xtt-null-pointer.patch
-Patch45: %{name}-i740-driver-update-cvs-20020617.patch
-Patch46: %{name}-neomagic-Xv-support.patch
-Patch47: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch48: %{name}-tdfx-should-be-2048-not-2046.patch
-Patch49: %{name}-tdfx-interlace.patch
-Patch50: %{name}-tdfx-fix-compiler-warnings.patch
-Patch51: %{name}-tdfx-fix-vtswitch-font-corruption.patch
-Patch52: %{name}-sis-option-swcursor.patch
-Patch53: %{name}-sis-unresolved-symbols.patch
-Patch54: %{name}-sis-maxxfbmem-fixup.patch
-Patch55: %{name}-Radeon9000.patch
-Patch56: %{name}-Xfont-Type1-large-DoS.patch
-# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
-# loading failure with "debug_xform.o: no symbols"
-Patch57: %{name}-GLcore-strip-a-workaround.patch
-# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
-Patch58: %{name}-4.2.1-mit-shm-security.patch
-Patch59: %{name}-disable_glide.patch
-Patch60: %{name}-expat.patch
-Patch61: %{name}-ProjectRoot.patch
+Patch30: %{name}-alpha_GLX_align_fix.patch
+Patch32: %{name}-xman-manpaths.patch
+Patch33: %{name}-clearrts.patch
+Patch34: %{name}-fix-07-s3trio64v2gx+netfinity.patch
+Patch35: %{name}-i740-driver-update-cvs-20020617.patch
+Patch36: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
+Patch38: %{name}-tdfx-fix-compiler-warnings.patch
+Patch39: %{name}-tdfx-fix-vtswitch-font-corruption.patch
+Patch40: %{name}-Xfont-Type1-large-DoS.patch
+# "strip -g libGLcore.a" leaves empty objects m_debug_*.o, which cause
+# warnings during GLcore loading ("m_debug_*.o: no symbols") - shut up them
+Patch41: %{name}-GLcore-strip-a-workaround.patch
+Patch42: %{name}-disable_glide.patch
+Patch43: %{name}-expat.patch
+Patch44: %{name}-pkgconfig.patch
+# spencode.o in libspeedo.a is empty - patch like for libGLcore.a
+Patch45: %{name}-spencode-nowarning.patch
+# Small (maybe buggy) patch to resolve problems with totem 0.97.0
+Patch46: %{name}-lock.patch
+Patch47: %{name}-sparc-kbd.patch
+
+Patch49: %{name}-mandir-fix.patch
+Patch50: %{name}-xterm-256colors.patch
+
+Patch52: %{name}-kernel_headers.patch
+Patch53: %{name}-stdint.patch
+URL: http://www.xfree86.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}
+%endif
BuildRequires: bison
+BuildRequires: ed
+BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
-BuildRequires: gcc-c++
+BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: perl
+BuildRequires: rpmbuild(macros) >= 1.143
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-BuildRequires: libstdc++-devel
-%ifarch %{ix86} alpha
-%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
-%endif
-# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86}
-%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
-%endif
+Requires: %{name}-libs = %{epoch}:%{version}
Requires: xauth
-Requires: %{name}-libs = %{version}
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
+Requires: pam >= 0.77.3
+ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
Obsoletes: xterm
Obsoletes: X11R6.1
%endif
-%define _pixmapsdir /usr/share/pixmaps
-%define _icondir /usr/share/icons
-%define _wmpropsdir %{_datadir}/wm-properties
+%define _prefix /usr/X11R6
+%define _mandir %{_prefix}/man
+%define _soundsdir /usr/share/sounds
+%define _themesdir /usr/share/themes
+%define _wmpropsdir /usr/share/wm-properties
+%define _xsessdir /usr/share/xsessions
+%define _libx11dir %{_prefix}/lib/X11
+%define _appdefsdir %{_libx11dir}/app-defaults
# avoid Mesa dependency in XFree86-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
-%description
-If you want to install the X Window System (TM) on your machine,
-you'll need to install XFree86.
+# ELF objects with Rendition microcode - disliked by ELF utils
+%define _noautostrip .*\\.uc
+%define _noautochrpath .*\\.uc
+%description
The X Window System provides the base technology for developing
graphical user interfaces. Simply stated, X draws the elements of the
GUI on the user's screen and builds methods for sending user
Summary: Display PostScript
Summary(pl): Display PostScript
Group: X11/XFree86
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
Obsoletes: dgs
wy¶wietlania informacji na ekranie.
%package DPS-devel
-Summary: Display PostScript
-Summary(pl): Display PostScript
+Summary: Header files for Display PostScript
+Summary(pl): Pliki nag³ówkowe dla Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS = %{version}
+Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-devel
%description DPS-devel
Pliki nag³ówkowe biblioteki X-Window Display PostScript.
%package DPS-static
-Summary: Display PostScript
-Summary(pl): Display PostScript
+Summary: Display PostScript static libraries
+Summary(pl): Biblioteki statyczne Display PostScript
Group: X11/XFree86
-Requires: %{name}-DPS-devel = %{version}
+Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-static
%description DPS-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 xft
-Summary: Font rendering library
-Summary(pl): Biblioteka wy¶wietlaj±ca fonty
-Group: X11/XFree86
-Requires: %{name}-libs = %{version}
-
-%description xft
-Font rendering library.
-
-%description xft -l pl
-Biblioteka wy¶wietlaj±ca fonty.
-
-%package xft-devel
-Summary: Xft font rendering library headers
-Summary(pl): Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty
-Group: X11/XFree86
-Requires: %{name}-xft = %{version}
-Requires: %{name}-devel = %{version}
-
-%description xft-devel
-Xft font rendering library headers.
-
-%description xft-devel -l pl
-Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty.
-
-%package xft-static
-Summary: Xft font rendering static library
-Summary(pl): Statyczna biblioteka Xft wy¶wietlaj±ca fonty
-Group: X11/XFree86
-Requires: %{name}-xft-devel = %{version}
-
-%description xft-static
-Xft font rendering static library.
-
-%description xft-static -l pl
-Statyczna biblioteka Xft wy¶wietlaj±ca fonty.
-
-%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
-Requires: %{name}-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-nvidia
%description OpenGL-core
%description OpenGL-core -l pl
Wsparcie OpenGL dla systemu X11R6.
+%package OpenGL-libGL
+Summary: OpenGL support for X11R6 - GL library
+Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
+Group: X11/Libraries
+Requires: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-firegl
+
+%description OpenGL-libGL
+OpenGL support for X11R6 system - GL library.
+
+%description OpenGL-libGL -l pl
+Wsparcie OpenGL dla systemu X11R6 - biblioteka GL.
+
%package OpenGL-devel
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
-Group: X11/Libraries
-Requires: %{name}-OpenGL-libs = %{version}
-Requires: %{name}-devel
+Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Requires: OpenGL-devel-base
Provides: OpenGL-devel
Obsoletes: Mesa-devel
-Obsoletes: glxMesa-devel
Obsoletes: XFree86-OpenGL-doc
+Obsoletes: glxMesa-devel
%description OpenGL-devel
Headers and man pages for OpenGL for X11R6.
%description OpenGL-devel -l pl
Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
+%package OpenGL-devel-base
+Summary: OpenGL for X11R6 development (GL and GLX only)
+Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko GL i GLX)
+Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: OpenGL-devel-base
+
+%description OpenGL-devel-base
+Base headers (GL and GLX only) for OpenGL for X11R6.
+
+%description OpenGL-devel-base -l pl
+Podstawowe pliki nag³ówkowe (tylko GL i GLX) OpenGL dla systemu X11R6.
+
%package OpenGL-libs
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
-Requires: %{name}-libs = %{version}
-Requires: %{name}-OpenGL-core
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: OpenGL
-Obsoletes: %{name}-OpenGL
Obsoletes: Mesa
+Obsoletes: XFree86-OpenGL
%description OpenGL-libs
OpenGL libraries for X11R6 system.
%package OpenGL-static
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
-Group: X11/Libraries
-Requires: %{name}-OpenGL-devel = %{version}
+Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-static
Obsoletes: Mesa-static
Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-common /usr/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: XFree86-fonts-base
%description Xnest
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-common /usr/lib/X11/rgb.txt
-Requires: XFree86-fonts-base
PreReq: xprint-initrc
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+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
-Requires: pam
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-common /usr/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: XFree86-fonts-base
-Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono
+Requires: pam
+Obsoletes: XFree86-Mono
+Obsoletes: XFree86-SVGA
+Obsoletes: XFree86-VGA16
# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
-Obsoletes: XFree86-Sun XFree86-Sun24
+Obsoletes: XFree86-Sun
+Obsoletes: 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
+Obsoletes: XFree86-XF86Setup
+Obsoletes: Xconfigurator
%description Xserver
Generally used X server which uses display hardware. It requires
Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-common /usr/lib/X11/rgb.txt
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: XFree86-fonts-base
%description Xvfb
Summary(ru): âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÑ ÐÏ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÀ X11R6
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
-Group: X11/Libraries
-Requires: %{name}-libs = %{version}
-Requires: imake = %{version}
-Obsoletes: xpm-devel
+Group: X11/Development/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: imake = %{epoch}:%{version}-%{release}
Provides: xpm-devel
+Obsoletes: xpm-devel
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
+%package Xserver-devel
+Summary: Header files for XFree86 Xserver drivers/extensions development
+Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+
+%description Xserver-devel
+Header files for XFree86 Xserver drivers and extensions development.
+
+%description Xserver-devel -l pl
+Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera
+XFree86.
+
%package driver-apm
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
%description driver-ati
ATI video driver.
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: OpenGL
-Conflicts: XFree86-driver-nvidia
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Rage128
+Conflicts: XFree86-driver-nvidia
%description driver-r128
ATI Rage 128 video driver.
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: XFree86-driver-ati
Requires: OpenGL
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
%description driver-radeon
Summary: ATI video driver (ATI.2)
Summary(pl): Sterownik do kart ATI (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
%description driver-ati.2
-ATI video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
+ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/).
%description driver-ati.2 -l pl
Sterownik do kart ATI (ATI.2) projektu gatos
Summary: ATI Rage 128 video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
-Requires: XFree86-driver-ati.2
+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: ATI Radeon video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Radeon (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: XFree86-driver-ati.2
Requires: OpenGL
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+# dlopens libglide2x.so
+Requires: Glide_VG
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-i740
%description driver-i740
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-i810
%description driver-i810 -l pl
Sterownik do grafiki na uk³adach Intel i810/i815/i830.
+%package driver-imstt
+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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-imstt
+Integrated Micro Solutions Twin Turbo 128 driver.
+
+%description driver-imstt -l pl
+Sterownik do kart Integrated Micro Solutions Twin Turbo 128.
+
%package driver-mga
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-NeoMagic
%description driver-neomagic
%description driver-neomagic -l pl
Sterownik do kart NeoMagic.
+%package driver-newport
+Summary: Newport (XL) adapters video driver
+Summary(pl): Sterownik do kart Newport (XL)
+Group: X11/XFree86
+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
+Indigo2 machines).
+
+%description driver-newport -l pl
+Sterownik do kart Newport (XL) (wystêpuj±cych g³ównie w komputerach
+SGI Indy i Indigo).
+
+%package driver-nsc
+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 = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-nsc
+National Semiconductors GEODE family video driver. Supports GXLV (5530
+companion chip), SC1200, SC1400 and GX2 (5535 companion chip).
+
+%description driver-nsc -l pl
+Sterownik dla kart na uk³adach z rodziny GEODE firmy National
+Semiconductors. Obs³uguje GXLV (uk³ad towarzysz±cy 5530), SC1200,
+SC1400 oraz GX2 (uk³ad towarzysz±cy 5535).
+
%package driver-nv
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description driver-suntcx
suntcx - Sun TCX video cards driver.
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: OpenGL
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+# dlopens libglide3x.so
Requires: Glide3-DRI
-Conflicts: XFree86-driver-nvidia
+Requires: OpenGL
Obsoletes: XFree86-3dfx
+Conflicts: XFree86-driver-nvidia
%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
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{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}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Tseng XFree86-W32
%description driver-tseng
%description driver-tseng -l pl
Sterownik do kart firmy Tseng Labs.
+%package driver-via
+Summary: VIA CLE266 driver
+Summary(pl): Sterownik do kart VIA CLE266
+Group: X11/XFree86
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-via
+VIA CLE266 driver.
+
+%description driver-via -l pl
+Sterownik do kart VIA CLE266.
+
%package driver-vmware
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-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}
-Obsoletes: xpm
+Requires: %{name}-common = %{epoch}:%{version}-%{release}
Provides: xpm
+Obsoletes: xpm
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
%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
Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
Group: X11/XFree86
-Requires: %{name}-Xserver = %{version}
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-xf86cfg
%description setup
Summary(pl): Biblioteki statyczne X11R6
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
-Group: X11/Libraries
-Requires: %{name}-devel = %{version}
+Group: X11/Development/Libraries
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Obsoletes: xpm-static
-#Obsoletes: Mesa-static
%description static
X11R6 static libraries.
Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
Group: X11/XFree86
-Requires: %{name} >= %{version}
-Requires: XFree86-libs = %{version}
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
Obsoletes: X11R6-contrib
ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
+%package -n XcursorTheme-handhelds
+Summary: Cursors Theme "handhelds"
+Summary(pl): Motyw kursorów "handhelds"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-handhelds
+Cursors theme "handhelds" for X11.
+
+%description -n XcursorTheme-handhelds -l pl
+Motyw kursorów "handhelds" dla X11.
+
+%package -n XcursorTheme-redglass
+Summary: Cursors theme "redglass"
+Summary(pl): Motyw kursorów "redglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-redglass
+Cursors theme "redglass" for X11.
+
+%description -n XcursorTheme-redglass -l pl
+Motyw kursorów "redglass" dla X11.
+
+%package -n XcursorTheme-whiteglass
+Summary: Cursors theme "whiteglass"
+Summary(pl): Motyw kursorów "whiteglass"
+Group: X11/Themes
+Requires: XFree86-libs
+Requires: xcursor
+Conflicts: XFree86 < 4.3.99.901-0.2
+
+%description -n XcursorTheme-whiteglass
+Cursors theme "whiteglass" for X11.
+
+%description -n XcursorTheme-whiteglass -l pl
+Motyw kursorów "whiteglass" dla X11.
+
%package -n imake
Summary: C preprocessor interface to the make utility
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Requires: XFree86-libs = %{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
%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}-%{release}
%description -n xauth
The xauth program is used to edit and display the authorization
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
Group: X11/XFree86
-Requires: %{name} = %{version}
+PreReq: rc-scripts
+Requires(post,preun): /sbin/chkconfig
+Requires: %{name} = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: pam >= 0.71
-Requires: %{name}-libs = %{version}
-Requires: sessreg = %{version}
-Requires: /usr/bin/sessreg
+Requires: sessreg = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/bin/sessreg
Provides: XDM
-PreReq: chkconfig
Obsoletes: XFree86-xdm
Obsoletes: gdm
Obsoletes: kdm
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Group: X11/XFree86
-Requires: %{name}-libs = %{version}
-Requires: XFree86-fonts-base
-PreReq: chkconfig
+PreReq: rc-scripts
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/useradd
Requires(pre): /usr/sbin/groupadd
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
-Obsoletes: xfsft XFree86-xfs
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-fonts-base
+Obsoletes: XFree86-xfs
+Obsoletes: xfsft
%description -n xfs
This is a font server for XFree86. You can serve fonts to other X
#--- %prep ---------------------------
%prep
-%setup -q -c -a1
+%setup -q -c -b3
+#-b1 -b2 -a3
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p0
-# not ready yet
-#%patch6 -p0
+%patch6 -p0
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-#%patch11 -p0 --seems to be obsoleted
+%patch10 -p0
+#%patch11 -p0 -- obsoleted???
%patch12 -p1
%patch13 -p1
%patch14 -p0
%patch15 -p1
%patch16 -p0
-#%patch17 -p1 -- not ready, is it required?
+#%patch17 -p1 -- not ready, is it required?
%patch18 -p1
-#%patch19 -p1
-%patch20 -p0
+#%patch19 -p1 -- maybe should be updated to allow using make -j
+%patch20 -p0
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
-# needs updating (14 rejects)
-#%patch28 -p1
+#%patch28 -p1 -- needs update
%endif
%patch29 -p0
-#%patch30 -p1 -- obsoleted
-%patch31 -p1
-#%patch32 -p1 --obsoleted
-%patch33 -p0
-#%patch34 -p1 --obsoleted????????
-%ifarch ppc
-%patch35 --new version required
-%endif
-#%%{?_without_tdfx:%patch35} --same as above
-#%patch36 -p0 --obsoleted
-%patch37 -p1
-####%patch38 -p1
-#%patch39 -p1
-####%patch40 -p0
-####%patch41 -p1
-####%patch42 -p1 --obsoleted (all with ####)
-####%patch43 -p1
-####%patch44 -p1
-####%patch45 -p1
-####%patch46 -p1
-%{!?_without_tdfx:%patch47 -p0}
-#%{!?_without_tdfx:%patch48 -p0}
-%{!?_without_tdfx:%patch49 -p1}
-#%patch50 -p0
-%{!?_without_tdfx:%patch51 -p0}
-#%patch52 -p1
-#%patch53 -p1
-#%patch54 -p1
-#%patch55 -p0
-%patch56 -p1
-#%%{!?debug:%patch57 -p1} --obsoleted
-#%patch58 -p0 --obsoleted
-%{?_without_tdfx:%patch59 -p0}
-%patch60 -p0
-%patch61 -p0
+%patch30 -p1
+%patch32 -p1
+%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}
+#%patch38 -p0 -- causing problems IIRC (but not really needed)
+%{?with_tdfx:%patch39 -p0}
+%patch40 -p1
+%{!?debug:%patch41 -p1}
+%{!?with_tdfx:%patch42 -p0}
+%patch43 -p0
+%patch44 -p0
+%patch45 -p1
+%patch46 -p0
+%patch47 -p1
+%patch49 -p1
+%patch50 -p0
+%patch52 -p1
+%patch53 -p0
rm -f xc/config/cf/host.def
+#Remove fonts dir for faster build
+# only valid for snapshots
+rm -rf xc/fonts
+
# New ATI drivers
-#%cd xc/programs/Xserver/hw/xfree86/drivers
-#%bzcat %{SOURCE2} | tar x
+# cd xc/programs/Xserver/hw/xfree86/drivers
+#%bzcat %{SOURCE39} | tar x
# ati.2 directory
-# New SiS drivers
-#%cd sis
-#%zcat %{SOURCE38} | tar x
-
#--- %build --------------------------
%build
-%{__make} -S -C xc World DEFAULT_OS_CPU_FROB=%{_target_cpu} \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
- "ICONDIR=%{_icondir}"
+%{__make} -S -C xc World \
+ DEFAULT_OS_CPU_FROB=%{_target_cpu} \
+ CC="%{__cc}" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_iconsdir}" \
+ LINUXDIR="/dev/null"
%ifnarch alpha
#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
- $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,sounds} \
+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%{_appdefsdir}/{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 \
$RPM_BUILD_ROOT%{_sbindir} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
- $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \
- $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir}}
-
-%{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \
- "DOCDIR=/usr/share/doc/%{name}-%{version}" \
- "INSTBINFLAGS=-m 755" \
- "INSTPGMFLAGS=-m 755" \
- "RAWCPP=/lib/cpp" \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
- "ICONDIR=%{_icondir}" \
- install install.man
+ $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/mini,%{_pixmapsdir}/mini} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
+ $RPM_BUILD_ROOT%{_xsessdir} \
+ $RPM_BUILD_ROOT%{_pkgconfigdir}
+
+%{__make} -C xc install install.man \
+ DESTDIR="$RPM_BUILD_ROOT" \
+ DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ INSTBINFLAGS="-m 755" \
+ INSTPGMFLAGS="-m 755" \
+ RAWCPP="/lib/cpp" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_iconsdir}" \
+ LINUXDIR="/dev/null"
%ifnarch alpha
#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
-
%endif
+# fix pkgconfig path
+if [ "%{_pkgconfigdir}" != "/usr/lib/pkgconfig" ] ; then
+ mv $RPM_BUILD_ROOT/usr/lib/pkgconfig/* $RPM_BUILD_ROOT%{_pkgconfigdir}
+fi
+
# setting default X
rm -f $RPM_BUILD_ROOT%{_bindir}/X
ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
# add X11 links in /usr/bin, /usr/lib /usr/include
ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11
-ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11
+ln -sf %{_libx11dir} $RPM_BUILD_ROOT/usr/lib/X11
ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11
# fix libGL*.so links
ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so
ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so
+# according to OpenGL ABI for Linux v1.0
+# (http://oss.sgi.com/projects/ogl-sample/ABI/index.html)
+# libGL.so.1, libGL.so, libGLU.so.1, libGL.so must be accessible in /usr
+# libGL is already linked by XFree86 build, but libGLU not
+ln -sf %{_libdir}/libGLU.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so.1
+ln -sf %{_libdir}/libGLU.so $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so
+
+# move instead of symlinking
+rm -f $RPM_BUILD_ROOT/usr/include/GL
+mv -f $RPM_BUILD_ROOT%{_includedir}/GL $RPM_BUILD_ROOT/usr/include
+
+# get the most current OpenGL extensions
+cp -f %{SOURCE49} $RPM_BUILD_ROOT/usr/include/GL/glext.h
+
+# don't include shared version due to Motif issues
+rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so*
+
+# collect Xserver headers and make symlinks
+for f in `cat %{SOURCE40}`; do
+ install -D xc/${f} $RPM_BUILD_ROOT%{_includedir}/X11/Xserver/${f}
+done
+cd $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
+sh %{SOURCE41}
+cd -
+
# set up PLD xdm config
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm
install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs
install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config
-install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm
+install %{SOURCE9} $RPM_BUILD_ROOT%{_appdefsdir}/pl/XTerm
install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm
install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs
install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop
-install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements
-install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors
-install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
-install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
- $RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE30} $RPM_BUILD_ROOT%{_pixmapsdir}
-install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
- %{SOURCE36} %{SOURCE37} \
+install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \
+ %{SOURCE26} %{SOURCE27} %{SOURCE43} %{SOURCE44} %{SOURCE45} \
+ $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
+ %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE46} %{SOURCE47} \
+ %{SOURCE48} \
$RPM_BUILD_ROOT%{_pixmapsdir}
-bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+
+# twm desktop file for gdm/kdm support
+install %{SOURCE42} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
-> $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/etc/security/console.apps/xserver
+:> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
+:> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
-ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts
+ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts
# do not duplicate xkbcomp program
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp
+rm -f $RPM_BUILD_ROOT%{_libx11dir}/xkb/xkbcomp
ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp
-ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc
+ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
-rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
+rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
-:> $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def
+:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/XF86Config
rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
+# resolve conflict with man-pages
+mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
+
# directories for applications locales
echo '%defattr(644,root,root,755)' > XFree86-libs.lang
for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \
fr ga gl he hr hu is it ja ko lt mi mk nl nn no pl pt pt_BR ro ru sk \
- sl sr sv ta th tr uk wa zh_CN zh_CN.GB2312 zh_TW.Big5 ; do
+ sl sr sv ta th tr uk wa zh_CN zh_TW ; do
install -d $RPM_BUILD_ROOT%{_datadir}/locale/${lang}/LC_MESSAGES
echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang
done
gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
%endif
+# kill some stuff for cleaner build
+# (packaged separately, DRM already in kernel)
+rm -rf $RPM_BUILD_ROOT%{_pkgconfigdir}/{xcursor,xft}.pc \
+ $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \
+ $RPM_BUILD_ROOT%{_mandir}/{man3/fontconfig.3x,man1/fc-{cache,list}.1x} \
+ $RPM_BUILD_ROOT%{_libdir}/{libfontconfig.*,libXrender.*,libXcursor.*,libXft.{a,so.2*}} \
+ $RPM_BUILD_ROOT%{_includedir}/{fontconfig,X11/{Xcursor,Xft}} \
+ $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list,xcursor-config,xft-config} \
+ $RPM_BUILD_ROOT/etc/fonts \
+ $RPM_BUILD_ROOT%{_prefix}/src
+
+# skipped from removal - %%exclude is used for these
+# %{_includedir}/X11/extensions/{Xrender.h,render.h,renderproto.h}
+# %{_mandir}/man3/Xft.3x
+
%clean
rm -rf $RPM_BUILD_ROOT
#--- %post{un}, %preun, %verifyscript, %trigge ----------
-%post DPS -p /sbin/ldconfig
-%postun DPS -p /sbin/ldconfig
+%post DPS -p /sbin/ldconfig
+%postun DPS -p /sbin/ldconfig
-%post PEX -p /sbin/ldconfig
-%postun PEX -p /sbin/ldconfig
+%post OpenGL-core -p /sbin/ldconfig
+%postun OpenGL-core -p /sbin/ldconfig
-%post XIE -p /sbin/ldconfig
-%postun XIE -p /sbin/ldconfig
+%post OpenGL-libGL -p /sbin/ldconfig
+%postun OpenGL-libGL -p /sbin/ldconfig
-%post xft -p /sbin/ldconfig
-%postun xft -p /sbin/ldconfig
-
-%post OpenGL-libs -p /sbin/ldconfig
-%postun OpenGL-libs -p /sbin/ldconfig
+%post OpenGL-libs -p /sbin/ldconfig
+%postun OpenGL-libs -p /sbin/ldconfig
%post libs
umask 022
echo "found"
fi
+%pre modules
+if [ -d /etc/X11/xkb/geometry/hp ]; then
+ rm -rf /etc/X11/xkb/geometry/hp
+fi
+
%triggerpostun modules -- XFree86-modules < 4.0.2
if [ -d /usr/X11R6/lib/X11/xkb ]; then
rm -rf /usr/X11R6/lib/X11/xkb
- ln -sf /etc/X11/xkb /usr/lib/X11/xkb
+ ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
fi
%post -n xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm restart >&2
+ echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+ echo "WARNING: it will terminate all sessions opened from xdm!" >&2
else
echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
fi
%defattr(644,root,root,755)
%ifnarch sparc sparc64
%doc %{_docdir}/%{name}-%{version}
-%doc %{_libdir}/X11/doc
-%endif
-
-%{_libdir}/X11/app-defaults/UXTerm
-%{_libdir}/X11/app-defaults/XCalc
-%{_libdir}/X11/app-defaults/XCalc-color
-%{_libdir}/X11/app-defaults/XClipboard
-%{_libdir}/X11/app-defaults/XClock
-%{_libdir}/X11/app-defaults/XLoad
-%{_libdir}/X11/app-defaults/XLogo
-%{_libdir}/X11/app-defaults/XLogo-color
-%{_libdir}/X11/app-defaults/XSm
-%{_libdir}/X11/app-defaults/XTerm
-%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
-%{_libdir}/X11/app-defaults/XTerm-color
-%{_icondir}/*
-
-%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/fonts
-%attr(755,root,root) %{_libdir}/X11/xinit
-%attr(755,root,root) %{_libdir}/X11/xsm
+%doc %{_libx11dir}/doc
+%endif
+
+%{_appdefsdir}/UXTerm
+%{_appdefsdir}/XCalc
+%{_appdefsdir}/XCalc-color
+%{_appdefsdir}/XClipboard
+%{_appdefsdir}/XClock
+%{_appdefsdir}/XClock-color
+%{_appdefsdir}/XLoad
+%{_appdefsdir}/XLogo
+%{_appdefsdir}/XLogo-color
+%{_appdefsdir}/XSm
+%{_appdefsdir}/XTerm
+%lang(pl) %{_appdefsdir}/pl/XTerm
+%{_appdefsdir}/XTerm-color
+
+%attr(755,root,root) %{_libx11dir}/lbxproxy
+%attr(755,root,root) %{_libx11dir}/proxymngr
+%attr(755,root,root) %{_libx11dir}/rstart
+%attr(755,root,root) %{_libx11dir}/fonts
+%attr(755,root,root) %{_libx11dir}/xinit
+%attr(755,root,root) %{_libx11dir}/xsm
%dir /etc/X11/xinit
%dir /etc/X11/lbxproxy
%dir /etc/X11/xsm
/etc/X11/xsm/*
-%dir %{_libdir}/X11/x11perfcomp
-%attr(755,root,root) %{_libdir}/X11/x11perfcomp/*
+%dir %{_libx11dir}/x11perfcomp
+%attr(755,root,root) %{_libx11dir}/x11perfcomp/*
%attr(755,root,root) %{_bindir}/Xmark
%attr(755,root,root) %{_bindir}/appres
%attr(755,root,root) %{_bindir}/makestrs
%attr(755,root,root) %{_bindir}/mergelib
%attr(755,root,root) %{_bindir}/mkdirhier
-%attr(755,root,root) %{_bindir}/mkfontdir
-%attr(755,root,root) %{_bindir}/mkfontscale
%attr(755,root,root) %{_bindir}/mkhtmlindex
%attr(755,root,root) %{_bindir}/proxymngr
%attr(755,root,root) %{_bindir}/resize
%{_includedir}/X11/bitmaps
%{_includedir}/X11/pixmaps
-%{_applnkdir}/Utilities/xconsole.desktop
-%{_applnkdir}/Terminals/*
-%{_libdir}/X11/app-defaults/Xvidtune
-%{_pixmapsdir}/x*
+%{_desktopdir}/xconsole.desktop
+%{_desktopdir}/xterm.desktop
+%{_pixmapsdir}/xconsole.png
+%{_pixmapsdir}/xlogo64.png
+%{_pixmapsdir}/xterm.png
+
+%{_appdefsdir}/Xvidtune
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%{_mandir}/man1/makeg.1*
%{_mandir}/man1/mergelib.1*
%{_mandir}/man1/mkdirhier.1*
-%{_mandir}/man1/mkfontdir.1*
-%{_mandir}/man1/mkfontscale.1*
%{_mandir}/man1/mkhtmlindex.1*
%{_mandir}/man1/proxymngr.1*
%{_mandir}/man1/resize.1*
%lang(pl) %{_mandir}/pl/man1/xinit.1*
%lang(pl) %{_mandir}/pl/man1/xwd.1*
+# to be separated
+%attr(755,root,root) %{_bindir}/fonttosfnt
+%attr(755,root,root) %{_bindir}/mkfontdir
+%attr(755,root,root) %{_bindir}/mkfontscale
+%{_mandir}/man1/fonttosfnt.1*
+%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+
%files common
%defattr(644,root,root,755)
/usr/bin/X11
/usr/lib/X11
%dir %{_bindir}
%dir %{_libdir}
-%dir %{_libdir}/X11
-%{_libdir}/X11/rgb.txt
+%dir %{_libx11dir}
+%{_libx11dir}/rgb.txt
%files DPS
%defattr(644,root,root,755)
%{_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 xft
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so.*.*
-#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig
-
-%files xft-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so
-%{_includedir}/X11/Xft
-
-%files xft-static
-%defattr(644,root,root,755)
-%{_libdir}/libXft.a
-
-%files XIE
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXIE.so.*.*
-%attr(755,root,root) %{_bindir}/xieperf
-%{_mandir}/man1/xieperf.1*
-
-%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) %{_bindir}/glxgears
-%attr(755,root,root) %{_libdir}/libGL.so.*.*
-%attr(755,root,root) %{_libdir}/libGL.so
%attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
%{_mandir}/man1/glxgears.1x*
+%files OpenGL-libGL
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libGL.so.*.*
+%attr(755,root,root) %{_libdir}/libGL.so
+# Linux OpenGL ABI compatibility symlinks
+%attr(755,root,root) /usr/%{_lib}/libGL.so.1
+%attr(755,root,root) /usr/%{_lib}/libGL.so
+
%files OpenGL-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGLU.so
-%attr(755,root,root) %{_libdir}/libOSMesa*.so
+%attr(755,root,root) %{_libdir}/libOSMesa.so
+# Linux OpenGL ABI compatibility symlink
+%attr(755,root,root) /usr/%{_lib}/libGLU.so
%{_libdir}/libGLw.a
-%dir %{_includedir}/GL
-%attr(644,root,root) %{_includedir}/GL/*
+%dir /usr/include/GL
+/usr/include/GL/GLwDrawA.h
+/usr/include/GL/GLwDrawAP.h
+/usr/include/GL/GLwMDrawA.h
+/usr/include/GL/GLwMDrawAP.h
+/usr/include/GL/glu.h
+/usr/include/GL/glxext.h
+/usr/include/GL/glxint.h
+/usr/include/GL/glxmd.h
+/usr/include/GL/glxproto.h
+/usr/include/GL/osmesa.h
%{_mandir}/man3/gl[A-Z]*
%{_mandir}/man3/glu*
%{_mandir}/man3/GLw*
+%files OpenGL-devel-base
+%defattr(644,root,root,755)
+/usr/include/GL/gl.h
+/usr/include/GL/glx.h
+/usr/include/GL/glext.h
+/usr/include/GL/glxtokens.h
+
%files OpenGL-libs
%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.*.*
+# Linux OpenGL ABI compatibility symlink
+%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
%{_mandir}/man1/glxinfo.1*
%files OpenGL-static
%defattr(644,root,root,755)
%{_libdir}/libGL.a
%{_libdir}/libGLU.a
-%{_libdir}/libOSMesa*.a
+%{_libdir}/libOSMesa.a
%files Xnest
%defattr(644,root,root,755)
%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*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/XF86Config.5*
+%{_mandir}/man5/getconfig.5*
-%{_libdir}/X11/Cards
-%{_libdir}/X11/Options
+%{_libx11dir}/Cards
+%{_libx11dir}/Options
+%{_libx11dir}/getconfig
%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XF86Config
%attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_bindir}/xcursor-config
-%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so
-%attr(755,root,root) %{_libdir}/libXfont*.so
-%attr(755,root,root) %{_libdir}/libI*.so
-%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}/libXcursor.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}/X11/Xcursor
%{_includedir}/xf86*.h
-%{_libdir}/X11/config
-%{_pkgconfigdir}/xcursor.pc
+%{_libx11dir}/config
-%{_mandir}/man3/[A-EH-Z]*
+%exclude %{_includedir}/X11/extensions/Xrender.h
+%exclude %{_includedir}/X11/extensions/render.h
+%exclude %{_includedir}/X11/extensions/renderproto.h
-%ifnarch sparc sparc64 alpha ppc
+%{_mandir}/man3/[A-FH-Z]*
+%exclude %{_mandir}/man3/Xft.3*
+
+%files Xserver-devel
+%defattr(644,root,root,755)
+%{_includedir}/X11/Xserver
+
+# Devel: sparc sparc64
+%ifarch %{ix86} amd64
%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 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} amd64
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
-%ifnarch sparc sparc64 alpha
+# Devel: sparc sparc64
+%ifarch %{ix86} mips ppc arm amd64
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
%{_mandir}/man4/chips*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha amd64
%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 ppc
+%ifarch %{ix86} amd64
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
%{_mandir}/man4/cyrix*
%endif
-%ifnarch alpha
+%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
%files driver-fbdev
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
-%{_mandir}/man4/fbdev*
+%{_mandir}/man4/fbdev.4*
%endif
-%ifnarch sparc sparc64 alpha ppc
-%{!?_without_tdfx:%files driver-glide}
-%{!?_without_tdfx:%defattr(644,root,root,755)}
-%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o}
-%{!?_without_tdfx:%{_mandir}/man4/glide*}
+%ifarch %{ix86}
+%if %{with tdfx}
+%files driver-glide
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
+%{_mandir}/man4/glide*
+%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
%{_mandir}/man4/glint*
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} amd64
%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 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%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 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
%{_mandir}/man4/i810*
%endif
-%ifnarch sparc sparc64
+# Devel: %{ix86} sparc sparc64 ppc amd64
+%if 0
+%files driver-imstt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.o
+%{_mandir}/man4/imstt.4*
+%endif
+
+%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
%files driver-mga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
+%endif
%{_mandir}/man4/mga*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} amd64
%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
+# Devel: %{ix86} sparc sparc64 amd64
+%ifarch mips
+%files driver-newport
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
+%{_mandir}/man4/newport.4*
+%endif
+
+%ifarch %{ix86}
+%files driver-nsc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.o
+%{_mandir}/man4/nsc.4*
+%endif
+
+# Devel: sparc sparc64
+%ifarch %{ix86} mips alpha arm ppc amd64
%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*
%endif
-
%files driver-ati
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
%{_mandir}/man4/r128*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
-
+%{_mandir}/man4/radeon*
%ifnarch alpha
#%%files driver-ati.2
#%ifnarch sparc sparc64
#%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
#%endif
-#%{_mandir}/man4/r128*
+#%%{_mandir}/man4/r128*
%endif
%ifnarch alpha
#%endif
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha amd64
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
+%{_libdir}/modules/*.uc
%{_mandir}/man4/rendition*
%endif
-%ifnarch sparc sparc64
+# Devel: sparc sparc64
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-s3virge
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
%{_mandir}/man4/s3virge*
%endif
-%ifnarch sparc sparc64
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
-#%{_mandir}/man4/s3*
+#%%{_mandir}/man4/s3.4*
%endif
-%ifnarch sparc sparc64
+# Devel: sparc sparc64
+%ifarch %{ix86} mips alpha ppc arm amd64
%files driver-savage
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
%{_mandir}/man4/savage*
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha amd64
%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
-#%files driver-sis
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
-#%ifnarch ppc
-#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
-#%endif
-#%{_mandir}/man4/sis*
+%ifarch %{ix86} mips ppc arm amd64
+%files driver-sis
+%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
+%endif
+%{_mandir}/man4/sis*
%endif
%ifarch sparc sparc64
%{_mandir}/man4/suntcx*
%endif
-%ifnarch sparc sparc64 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}
-%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so}
-%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
+%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
+%if %{with tdfx}
+%files driver-tdfx
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
+%ifarch %{ix86} alpha arm ppc
+%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
+%endif
+%{_mandir}/man4/tdfx*
+%endif
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha amd64
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
-%ifnarch sparc sparc64 alpha
+# Devel: sparc sparc64
+%ifarch %{ix86} mips ppc arm amd64
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
%{_mandir}/man4/trident*
%endif
-%ifnarch sparc sparc64 alpha ppc
+%ifarch %{ix86} amd64
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
%{_mandir}/man4/tseng*
%endif
+%ifarch %{ix86}
+%files driver-via
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%{_mandir}/man4/via.4*
+%endif
+
+# Devel: sparc sparc64
%ifarch %{ix86}
%files driver-vmware
%defattr(644,root,root,755)
%files libs -f XFree86-libs.lang
%defattr(644,root,root,755)
-%{_libdir}/X11/XErrorDB
-%{_libdir}/X11/XKeysymDB
-%dir %{_libdir}/X11/app-defaults
-%lang(cs) %dir %{_libdir}/X11/app-defaults/cs
-%lang(da) %dir %{_libdir}/X11/app-defaults/da
-%lang(de) %dir %{_libdir}/X11/app-defaults/de
-%lang(es) %dir %{_libdir}/X11/app-defaults/es
-%lang(fr) %dir %{_libdir}/X11/app-defaults/fr
-%lang(hu) %dir %{_libdir}/X11/app-defaults/hu
-%lang(ko) %dir %{_libdir}/X11/app-defaults/ko
-%lang(nl) %dir %{_libdir}/X11/app-defaults/nl
-%lang(pl) %dir %{_libdir}/X11/app-defaults/pl
-%lang(pt) %dir %{_libdir}/X11/app-defaults/pt
-%lang(ru) %dir %{_libdir}/X11/app-defaults/ru
-%lang(sk) %dir %{_libdir}/X11/app-defaults/sk
-%lang(zh_CN) %dir %{_libdir}/X11/app-defaults/zh_CN.gb2312
-%lang(zh_TW) %dir %{_libdir}/X11/app-defaults/zh_TW.big5
-%{_libdir}/X11/locale
+%dir /etc/xdg
+%dir %{_themesdir}
+%dir %{_themesdir}/Default
+%dir %{_themesdir}/ThinIce
+%{_libx11dir}/XErrorDB
+%{_libx11dir}/XKeysymDB
+%dir %{_appdefsdir}
+%lang(cs) %dir %{_appdefsdir}/cs
+%lang(da) %dir %{_appdefsdir}/da
+%lang(de) %dir %{_appdefsdir}/de
+%lang(es) %dir %{_appdefsdir}/es
+%lang(fr) %dir %{_appdefsdir}/fr
+%lang(hu) %dir %{_appdefsdir}/hu
+%lang(ko) %dir %{_appdefsdir}/ko
+%lang(nl) %dir %{_appdefsdir}/nl
+%lang(pl) %dir %{_appdefsdir}/pl
+%lang(pt) %dir %{_appdefsdir}/pt
+%lang(ru) %dir %{_appdefsdir}/ru
+%lang(sk) %dir %{_appdefsdir}/sk
+%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
+%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
+%{_libx11dir}/locale
%dir %{_includedir}
%dir %{_includedir}/X11
+/usr/include/X11
%dir %{_sbindir}
-#/usr/include/X11
%dir %{_datadir}/locale
%dir %{_datadir}/misc
-%dir %{_datadir}/sounds
+%dir %{_iconsdir}
+%dir %{_iconsdir}/mini
%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.*.*
+%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)
%attr(755,root,root) %{_bindir}/xkbcomp
-%{_libdir}/X11/xkb
+%{_libx11dir}/xkb
%{_sysconfdir}/X11/xkb
/var/lib/xkb
%dir %{_libdir}/modules
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
-%ifnarch sparc sparc64 ppc
-%{_libdir}/modules/*.uc
-%endif
%attr(755,root,root) %{_libdir}/modules/*.a
%attr(755,root,root) %{_libdir}/modules/codeconv
+%ifnarch amd64
%attr(755,root,root) %{_libdir}/modules/drivers/linux
-%ifnarch sparc sparc64
+%endif
+%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
-%ifnarch alpha ppc
-%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
+%ifarch %{ix86} sparc sparc64 amd64
+%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.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
+%attr(755,root,root) %{_libx11dir}/xserver
%dir /etc/X11/xserver
/etc/X11/xserver/SecurityPolicy
-#%{_mandir}/man1/xtr*
+#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
+%{_mandir}/man4/aiptek.4*
%{_mandir}/man4/citron*
%{_mandir}/man4/dmc.4*
%{_mandir}/man4/dynapro*
+%{_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/mouse* - conflicts with man-pages - fixme
+%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
+%{_mandir}/man4/tek4957.4*
+%{_mandir}/man4/ur98.4*
+%ifnarch amd64
%{_mandir}/man4/v4l*
-%ifnarch sparc sparc64
+%endif
+%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
%{_mandir}/man4/vga*
-%ifnarch alpha ppc
-%{_mandir}/man4/vesa*
%endif
+%ifarch %{ix86} sparc sparc64 amd64
+%{_mandir}/man4/vesa*
%endif
%{_mandir}/man4/void*
%{_mandir}/man4/wacom*
%{_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}/pcitweak
%endif
%attr(755,root,root) %{_bindir}/xf86cfg
%attr(755,root,root) %{_bindir}/xf86config
-%{_libdir}/X11/app-defaults/XF86Cfg
+%{_appdefsdir}/XF86Cfg
%ifnarch ppc
%{_mandir}/man1/scanpci.1*
%endif
%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}/libXrender.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)
%attr(755,root,root) %{_bindir}/rman
%attr(755,root,root) %{_bindir}/xtrap*
%attr(755,root,root) %{_bindir}/texteroids
-%{_libdir}/X11/xedit
-%{_libdir}/X11/xman.help
+%{_libx11dir}/xedit
+%{_libx11dir}/xman.help
%{_mandir}/man1/beforelight.1*
%{_mandir}/man1/ico.1*
%{_mandir}/man1/listres.1*
%lang(pl) %{_mandir}/pl/man1/rman.1*
-%{_libdir}/X11/app-defaults/Beforelight
-%{_libdir}/X11/app-defaults/Bitmap
-%{_libdir}/X11/app-defaults/Bitmap-color
-%{_libdir}/X11/app-defaults/Clock-color
-%{_libdir}/X11/app-defaults/Editres
-%{_libdir}/X11/app-defaults/Editres-color
-%{_libdir}/X11/app-defaults/Viewres
-%{_libdir}/X11/app-defaults/XConsole
-%{_libdir}/X11/app-defaults/Xedit
-%{_libdir}/X11/app-defaults/Xedit-color
-%{_libdir}/X11/app-defaults/Xfd
-%{_libdir}/X11/app-defaults/Xgc
-%{_libdir}/X11/app-defaults/Xmag
-%{_libdir}/X11/app-defaults/Xman
-%{_libdir}/X11/app-defaults/Xmessage
-%{_libdir}/X11/app-defaults/Xmessage-color
-%{_libdir}/X11/app-defaults/Xmh
-%{_libdir}/X11/app-defaults/XFontSel
-%{_libdir}/X11/app-defaults/Xditview
-%{_libdir}/X11/app-defaults/Xditview-chrtr
-
-%{_applnkdir}/Utilities/xclipboard.desktop
-%{_applnkdir}/Utilities/oclock.desktop
-%{_applnkdir}/Utilities/xclock.desktop
-%{_applnkdir}/Editors/xedit.desktop
-%{_applnkdir}/Amusements/xeyes.desktop
-%{_pixmapsdir}/oclock*
+%{_appdefsdir}/Beforelight
+%{_appdefsdir}/Bitmap
+%{_appdefsdir}/Bitmap-color
+%{_appdefsdir}/Clock-color
+%{_appdefsdir}/Editres
+%{_appdefsdir}/Editres-color
+%{_appdefsdir}/Viewres
+%{_appdefsdir}/XConsole
+%{_appdefsdir}/Xedit
+%{_appdefsdir}/Xedit-color
+%{_appdefsdir}/Xfd
+%{_appdefsdir}/Xgc
+%{_appdefsdir}/Xmag
+%{_appdefsdir}/Xman
+%{_appdefsdir}/Xmessage
+%{_appdefsdir}/Xmessage-color
+%{_appdefsdir}/Xmh
+%{_appdefsdir}/XFontSel
+%{_appdefsdir}/Xditview
+%{_appdefsdir}/Xditview-chrtr
+
+%{_desktopdir}/oclock.desktop
+%{_desktopdir}/xcalc.desktop
+%{_desktopdir}/xclipboard.desktop
+%{_desktopdir}/xclock.desktop
+%{_desktopdir}/xedit.desktop
+%{_desktopdir}/xeyes.desktop
+%{_desktopdir}/xload.desktop
+%{_desktopdir}/xmag.desktop
+%{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xcalc.png
+%{_pixmapsdir}/xclipboard.png
+%{_pixmapsdir}/xclock.png
+%{_pixmapsdir}/xedit.png
+%{_pixmapsdir}/xeyes.png
+%{_pixmapsdir}/xload.png
+%{_pixmapsdir}/xmag.png
+
+%files -n XcursorTheme-handhelds
+%defattr(644,root,root,755)
+%{_iconsdir}/handhelds
+
+%files -n XcursorTheme-redglass
+%defattr(644,root,root,755)
+%{_iconsdir}/redglass
+
+%files -n XcursorTheme-whiteglass
+%defattr(644,root,root,755)
+%{_iconsdir}/whiteglass
%files -n imake
%defattr(644,root,root,755)
%files -n twm
%defattr(644,root,root,755)
%{_wmpropsdir}/twm.desktop
+%{_xsessdir}/twm.desktop
%attr(755,root,root) %{_bindir}/twm
%dir %{_sysconfdir}/X11/twm
%config %{_sysconfdir}/X11/twm/system.twmrc
-%attr(755,root,root) %{_libdir}/X11/twm
+%attr(755,root,root) %{_libx11dir}/twm
%{_mandir}/man1/twm.1*
%files -n xauth
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
/var/lib/xdm
-%{_libdir}/X11/app-defaults/Chooser
+%{_appdefsdir}/Chooser
-%attr(755,root,root) %{_libdir}/X11/xdm
+%attr(755,root,root) %{_libx11dir}/xdm
%attr(755,root,root) %{_bindir}/xdm
%attr(755,root,root) %{_bindir}/chooser
-%ifarch alpha
-%attr(755,root,root) %{_libdir}/libXdmGreet.so*
-%endif
%{_mandir}/man1/xdm.1*
%dir /etc/X11/xdm
%attr(754,root,root) /etc/rc.d/init.d/xfs
%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
+%attr(755,root,root) %{_libx11dir}/fs
%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
%attr(755,root,root) %{_bindir}/xfs
%attr(755,root,root) %{_bindir}/fstobdf
%attr(755,root,root) %{_bindir}/mkcfm
%attr(755,root,root) %{_bindir}/xfsinfo
-#%attr(755,root,root) %{_bindir}/xftcache
%{_mandir}/man1/xfs.1*
%{_mandir}/man1/fslsfonts.1*
%{_mandir}/man1/fstobdf.1*
%{_mandir}/man1/mkcfm.1*
%{_mandir}/man1/xfsinfo.1*
-#%{_mandir}/man1/xftcache.1*
projects / packages / XFree86.git / blobdiff