# - separate XFS to be standalone - is it possible without duplicated files?
#
# Conditional build:
-%bcond_without tdfx # disables tdfx drivers building
+%bcond_without glide # don't build glide driver
+%bcond_with cursors # build with XcursorTheme-* packages
#
Summary: XFree86 Window System servers and basic programs
Summary(de): XFree86 Window-System-Server und grundlegende Programme
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
Version: 4.4.0
-Release: 0.1
+Release: 11
Epoch: 1
License: XFree86 1.1
-Group: X11/XFree86
+Group: X11
Source0: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-1.tgz
# Source0-md5: 97cea3d9e1197dde32ca34e3b6086469
Source1: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-2.tgz
# Source1-md5: b9b6c74a03e314569e01d5fd4ff59523
Source2: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-3.tgz
# Source2-md5: 703404f48d3a15f58389a879d47c769d
-Source3: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-4.tgz
-# Source3-md5: 5d1792f5c154c7462c6aef39c7853b3b
-Source4: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-5.tgz
-# Source4-md5: 5c37f028efc6d54a9c725e333f9cc8ae
-Source5: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-6.tgz
-# Source5-md5: d1e12c33e9756d5143004a69f2cdac81
-Source6: ftp://ftp.xfree86.org/pub/XFree86/4.4.0/source/XFree86-4.4.0-src-7.tgz
-# Source6-md5: 947a34279a0ca2da2f300719c583845e
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source41: xconsole.png
Source42: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
# Source42-md5: a184106bb83cb27c6963944d9243ac3f
-#Source43: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
Source44: %{name}-Xserver-headers
Source45: %{name}-Xserver-headers-links
Source46: twm-xsession.desktop
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: bf9b05a66798796b53ed1a050049b2ee
+# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Source54: XFree86-xrender.pc
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch52: %{name}-kernel_headers.patch
Patch53: %{name}-stdint.patch
Patch54: %{name}-lnx_kbd.patch
+Patch55: %{name}-elfloader-linux-non-exec-stack.patch
+Patch56: %{name}-exec-shield-GNU-stack.patch
+Patch57: %{name}-libGL-exec-shield-fixes-v2.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}
+%ifarch %{ix86} %{x8664} ia64
+%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.143
+BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-Requires: %{name}-libs = %{epoch}:%{version}
-Requires: xauth
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
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
-
%ifarch sparc sparc64
Obsoletes: X11R6.1
%endif
+ExclusiveArch: %{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%define _soundsdir /usr/share/sounds
%define _themesdir /usr/share/themes
+%define _wallpapersdir /usr/share/wallpapers
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
+%define _wmstylesdir /etc/sysconfig/wmstyles
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
X Window System jest graficznym interfejsem u¿ytkownika; cechuje siê
mo¿liwo¶ci± pracy w wielu oknach, z wieloma klientami i do tego w
ró¿nych wystrojach okien. :) Jest u¿ywany na wiêkszo¶ci platform
-sytemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi
+systemów Unix, a klienci mog± byæ uruchamiani tak¿e pod innymi
popularnymi systemami okienkowymi. Protokó³ X pozwala na uruchamianie
aplikacji zarówno z lokalnej maszyny jak i poprzez sieæ - daj±c przez
to elastyczn± implementacjê architektury klient/serwer.
%package common
Summary: XFree86 files required both on server and client side
Summary(pl): Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta
-Group: X11/XFree86
+Group: X11
%description common
XFree86 files required both on server and client side.
%package DPS
Summary: Display PostScript
Summary(pl): Display PostScript
-Group: X11/XFree86
+Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
Obsoletes: dgs
%package DPS-devel
Summary: Header files for Display PostScript
Summary(pl): Pliki nag³ówkowe dla Display PostScript
-Group: X11/XFree86
+Group: X11/Development/Libraries
Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-devel
%package DPS-static
Summary: Display PostScript static libraries
Summary(pl): Biblioteki statyczne Display PostScript
-Group: X11/XFree86
+Group: X11/Development/Libraries
Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
Obsoletes: dgs-static
Statyczne biblioteki X-Window Display PostScript.
%package OpenGL-core
-Summary: OpenGL support for X11R6
-Summary(pl): Wsparcie OpenGL dla systemu X11R6
-Group: X11/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: XFree86-OpenGL-libGL
-Obsoletes: XFree86-driver-nvidia
+Summary: OpenGL support extension modules for Xserver
+Summary(pl): Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL
+Group: X11/Xserver
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description OpenGL-core
-OpenGL support for X11R6 system.
+OpenGL support extension modules for Xserver.
%description OpenGL-core -l pl
-Wsparcie OpenGL dla systemu X11R6.
+Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL.
%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}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-driver-firegl
+Obsoletes: XFree86-driver-nvidia
%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/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: XFree86-OpenGL-doc
-Obsoletes: glxMesa-devel
+%package OpenGL-libs
+Summary: OpenGL libraries for X11R6
+Summary(pl): Biblioteki OpenGL dla systemu X11R6
+Group: X11/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: OpenGL = 1.4
+Provides: OpenGL-GLU = 1.3
+Provides: OpenGL-GLX = 1.4
+Obsoletes: Mesa
+Obsoletes: XFree86-OpenGL
-%description OpenGL-devel
-Headers and man pages for OpenGL for X11R6.
+%description OpenGL-libs
+OpenGL libraries for X11R6 system.
-%description OpenGL-devel -l pl
-Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
+%description OpenGL-libs -l pl
+Biblioteki OpenGL dla systemu X11R6.
%package OpenGL-devel-base
Summary: OpenGL for X11R6 development (GL and GLX only)
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-devel-base
+Obsoletes: XFree86-driver-nvidia-devel
%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}-OpenGL-core
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: OpenGL
-Obsoletes: Mesa
-Obsoletes: XFree86-OpenGL
+%package OpenGL-devel
+Summary: OpenGL for X11R6 development
+Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
+Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Requires: OpenGL-devel-base
+Provides: OpenGL-devel = 1.4
+Provides: OpenGL-GLU-devel = 1.3
+Provides: OpenGL-GLX-devel = 1.4
+Obsoletes: Mesa-devel
+Obsoletes: XFree86-OpenGL-doc
+Obsoletes: glxMesa-devel
-%description OpenGL-libs
-OpenGL libraries for X11R6 system.
+%description OpenGL-devel
+Headers and man pages for OpenGL for X11R6.
-%description OpenGL-libs -l pl
-Biblioteki OpenGL dla systemu X11R6.
+%description OpenGL-devel -l pl
+Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6.
%package OpenGL-static
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
-Provides: OpenGL-static
+Provides: OpenGL-static = 1.4
+Provides: OpenGL-GLU-static = 1.3
Obsoletes: Mesa-static
%description OpenGL-static
Summary(pl): Serwer XFree86 Xnest
Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
-Group: X11/XFree86/Servers
+Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package Xprt
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
-Group: X11/XFree86/Servers
+Group: X11/Servers
PreReq: xprint-initrc
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Summary(fr): Serveur XFree86
Summary(pl): Serwer XFree86
Summary(tr): XFree86 sunucusu
-Group: X11/XFree86/Servers
+Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
avez des problèmes.
%description Xserver -l pl
-Jest to podstawowy Xserwer wy¶wietlaj±cy obraz na karcie graficznej.
+Jest to podstawowy X serwer wy¶wietlaj±cy obraz na karcie graficznej.
Do dzia³ania wymaga odpowiedniego sterownika - sam pakiet zawiera
tylko odpowiedni dla kart VGA oraz SVGA zgodnych z VESA (bez
akceleracji). Inne sterowniki mo¿na znale¼æ w pakietach
Summary(pl): Serwer XFree86 Xvfb
Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
-Group: X11/XFree86/Servers
+Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: imake = %{epoch}:%{version}-%{release}
+Requires: %{name}-imake = %{epoch}:%{version}-%{release}
+Requires: fontconfig-devel >= 1:1.0.0
+Provides: render = 0.8
+Provides: xcursor-devel = 1.0
+Provides: xft-devel = 2.1.0
Provides: xpm-devel
-Obsoletes: xpm-devel
+Provides: xrender-devel = 0.8.0
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
+Obsoletes: XFree86-render
+Obsoletes: XFree86-xcursor-devel
+Obsoletes: XFree86-xft-devel
+Obsoletes: XFree86-xft2-devel
+Obsoletes: XFree86-xrender-devel
+Obsoletes: Xft-devel
+Obsoletes: render
+Obsoletes: xcursor-devel
+Obsoletes: xft-devel
+Obsoletes: xpm-devel
+Obsoletes: xrender-devel
%description devel
Libraries, header files, and documentation for developing programs
that run as X clients. It includes the base Xlib library as well as
-the Xt and Xaw widget sets. For information on programming with these
-libraries, PLD recommends the series of books on X Programming
-produced by O'Reilly and Associates.
+the Xt and Xaw widget sets.
%description devel -l de
Libraries, Header-Dateien und Dokumentation zum Entwickeln von
Programmen, die als X-Clients laufen. Enthält die Xlib-Library und die
-Widget-Sätze Xt und Xaw. Information zum Programmieren mit diesen
-Libraries finden Sie in der Buchreihe zur X-Programmierung von
-O'Reilly and Associates.
+Widget-Sätze Xt und Xaw.
%description devel -l fr
Bibliothéques, fichiers d'en-tête, et documentation pour développer
des programmes s'exécutant en clients X. Cela comprend la Bibliothéque
-Xlib de base aussi bien que les ensembles de widgets Xt et Xaw. Pour
-des informations sur la programmation avec ces Bibliothéques, Red Hat
-recommande la série d'ouvrages sur la programmation X editée par
-O'Reilly and Associates.
+Xlib de base aussi bien que les ensembles de widgets Xt et Xaw.
%description devel -l pl
Pliki nag³ówkowe, dokumentcja dla programistów rozwijaj±cych aplikacje
klienckie pod X Window. Zawiera podstawow± bibliotekê Xlib a tak¿e Xt
-i Xaw. Wiêcej informacji nt. pisania programów przy u¿yciu tych
-bibliotek mo¿esz znale¼æ w ksi±¿kach wydawnictwa O'Reilly and
-Associates (X Programming) polecanych przez Red Hata.
+i Xaw.
%description devel -l ru
XFree86-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ
%package driver-apm
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Alliance
%package driver-ark
Summary: Ark Logic video driver
Summary(pl): Sterownik do kart Ark Logic
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-ati
Summary: ATI video driver
Summary(pl): Sterownik do kart ATI
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
%package driver-r128
Summary: ATI Rage 128 video driver
Summary(pl): Sterownik do kart ATI Rage 128
-Group: X11/XFree86
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
Obsoletes: XFree86-Rage128
-Conflicts: XFree86-driver-nvidia
%description driver-r128
ATI Rage 128 video driver.
%package driver-radeon
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
-Group: X11/XFree86
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
%description driver-radeon
ATI Radeon video driver.
%description driver-radeon -l pl
Sterownik do kart ATI Radeon.
-%package driver-ati.2
-Summary: ATI video driver (ATI.2)
-Summary(pl): Sterownik do kart ATI (ATI.2)
-Group: X11/XFree86
-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/).
-
-%description driver-ati.2 -l pl
-Sterownik do kart ATI (ATI.2) projektu gatos
-(http://gatos.sourceforge.net/).
-
-%package driver-r128.2
-Summary: ATI Rage 128 video driver (ATI.2)
-Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2)
-Group: X11/XFree86
-Requires: OpenGL
-Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: %{name}-driver-ati.2
-Conflicts: XFree86-driver-nvidia
-Obsoletes: XFree86-Rage128
-
-%description driver-r128.2
-ATI Rage 128 video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
-
-%description driver-r128.2 -l pl
-Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos
-(http://gatos.sourceforge.net/).
-
-%package driver-radeon.2
-Summary: ATI Radeon video driver (ATI.2)
-Summary(pl): Sterownik do kart ATI Radeon (ATI.2)
-Group: X11/XFree86
-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
-ATI Radeon video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
-
-%description driver-radeon.2 -l pl
-Sterownik do kart ATI Radeon (ATI.2) projektu gatos
-(http://gatos.sourceforge.net/).
-
%package driver-chips
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ChipsTechnologies
%package driver-cirrus
Summary: Cirrus Logic video driver
Summary(pl): Sterownik do kart Cirrus Logic
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Cirrus
%package driver-cyrix
Summary: Cyrix video driver
Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Cyrix
%package driver-fbdev
Summary: Video driver for framebuffer device
Summary(pl): Sterownik korzystaj±cy z framebuffera
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-FBDev
%package driver-ffb
Summary: Video driver for DRI sparc framebuffer device
Summary(pl): Sterownik do framebuffera DRI na sparc
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-glide
Summary: 3Dfx Voodoo1 and Voodoo2 video driver
Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
# dlopens libglide2x.so
%package driver-glint
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
-Group: X11/XFree86
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
Obsoletes: XFree86-3DLabs
%description driver-glint
%package driver-i128
Summary: Number 9 I128 video driver
Summary(pl): Sterownik do kart Number 9 I128
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-I128
%package driver-i740
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-i740
%package driver-i810
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
-Group: X11/XFree86
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
+%ifarch %{ix86} ia64
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
Obsoletes: XFree86-i810
%description driver-i810
%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
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-mga
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
-Group: X11/XFree86
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: XFree86-driver-nvidia
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
Obsoletes: XFree86-mga
%description driver-mga
%package driver-neomagic
Summary: NeoMagic video driver
Summary(pl): Sterownik do kart NeoMagic
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-NeoMagic
%package driver-newport
Summary: Newport (XL) adapters video driver
Summary(pl): Sterownik do kart Newport (XL)
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%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
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-nv
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-NVidia
%package driver-rendition
Summary: Rendition video driver
Summary(pl): Sterownik do kart Rendition
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Rendition
%package driver-s3virge
Summary: S3 ViRGE/Trio3D video driver
Summary(pl): Sterownik do kart na uk³adach S3 ViRGE i Trio3D
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-S3V
%package driver-s3
Summary: S3 Trio video driver
Summary(pl): Sterownik do kart na uk³adach S3 Trio
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-S3
%package driver-savage
Summary: S3 Savage video driver
Summary(pl): Sterownik do kart na uk³adach S3 Savage
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-siliconmotion
Summary: Silicon Motion video driver
Summary(pl): Sterownik do kart na uk³adach Silicon Motion
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-sis
Summary: SiS video driver
Summary(pl): Sterownik do kart na uk³adach SiS
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
Obsoletes: XFree86-SiS
%description driver-sis
%package driver-sunbw2
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-SunMono
%package driver-suncg14
Summary: suncg14 - Sun CG14 video driver
Summary(pl): Sterownik do kolorowego framebuffera CG14 na Sunie
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-suncg3
Summary: suncg3 - Sun CG3 video cards driver
Summary(pl): Sterownik do kolorowego framebuffera CG3 na Sunie
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-suncg6
Summary: suncg6 - Sun GX and Turbo GX video driver
Summary(pl): Sterownik do grafiki GX i Turbo GX na Sunie
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-sunffb
Summary: sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver
Summary(pl): Sterownik do kart Sun Creator, Creator 3D, Elite 3D
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-sunleo
Summary: sunleo - Sun Leo (ZX) video cards driver
Summary(pl): Sterownik do kart Sun Leo (ZX)
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-suntcx
Summary: suntcx - Sun TCX video cards driver
Summary(pl): Sterownik do kart Sun TCX
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-tdfx
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 alpha arm ppc
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
# dlopens libglide3x.so
Requires: Glide3-DRI
-Requires: OpenGL
+%endif
Obsoletes: XFree86-3dfx
-Conflicts: XFree86-driver-nvidia
%description driver-tdfx
3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5.
%package driver-tga
Summary: TGA video driver
Summary(pl): Sterownik do kart TGA
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-TGA
%package driver-trident
Summary: Trident video driver
Summary(pl): Sterownik do kart Trident
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-Trident
%package driver-tseng
Summary: Tseng Labs video driver
Summary(pl): Sterownik do kart Tseng Labs
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-Tseng XFree86-W32
+Obsoletes: XFree86-Tseng
+Obsoletes: XFree86-W32
%description driver-tseng
Tseng Labs video driver.
%package driver-via
Summary: VIA CLE266 driver
Summary(pl): Sterownik do kart VIA CLE266
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%package driver-vmware
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
-Group: X11/XFree86
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Summary(pt_BR): Bibliotecas compartilhadas X11R6
Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4)
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
-Group: X11/XFree86
+Group: X11/Libraries
Requires(post,postun): /sbin/ldconfig
Requires(post,postun): grep
Requires(postun): fileutils
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: xcursor = 1.0
+Provides: xft = 2.1.0
Provides: xpm
-Obsoletes: xpm
-
+Provides: xrender = 0.8.0
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
%endif
+Obsoletes: XFree86-xcursor
+Obsoletes: XFree86-xft
+Obsoletes: XFree86-xft2
+Obsoletes: XFree86-xrender
+Obsoletes: Xft
+Obsoletes: xcursor
+Obsoletes: xft
+Obsoletes: xpm
+Obsoletes: xrender
%description libs
XFree86-libs contains the shared libraries that most X programs need
%package modules
Summary: Modules with X servers extensions
Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
-Group: X11/XFree86
+Group: X11/Servers
+Obsoletes: XFree86-module-PEX
+Obsoletes: XFree86-module-XIE
%description modules
Modules with X servers extensions.
Summary(pl): Graficzny konfigurator dla XFree86
Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86
-Group: X11/XFree86
+Group: X11
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-xf86cfg
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: xcursor-static = 1.0
+Provides: xft-static = 2.1.0
+Provides: xpm-static
+Provides: xrender-static = 0.8.0
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
+Obsoletes: XFree86-xcursor-static
+Obsoletes: XFree86-xft-static
+Obsoletes: XFree86-xrender-static
+Obsoletes: Xft-devel
+Obsoletes: xcursor-static
+Obsoletes: xft-static
Obsoletes: xpm-static
+Obsoletes: xrender-static
%description static
X11R6 static libraries.
Summary(pl): Ró¿ne narzêdzia dla XFree86
Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
-Group: X11/XFree86
+Group: X11
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
%package -n XcursorTheme-handhelds
Summary: Cursors Theme "handhelds"
Summary(pl): Motyw kursorów "handhelds"
-Group: X11/Themes
+Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-handhelds
%package -n XcursorTheme-redglass
Summary: Cursors theme "redglass"
Summary(pl): Motyw kursorów "redglass"
-Group: X11/Themes
+Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-redglass
%package -n XcursorTheme-whiteglass
Summary: Cursors theme "whiteglass"
Summary(pl): Motyw kursorów "whiteglass"
-Group: X11/Themes
+Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-whiteglass
%description -n XcursorTheme-whiteglass -l pl
Motyw kursorów "whiteglass" dla X11.
-%package -n imake
+%package imake
Summary: C preprocessor interface to the make utility
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Group: Development/Building
+Provides: imake = %{epoch}:%{version}-%{release}
+Obsoletes: imake
-%description -n imake
+%description imake
Imake is used to generate Makefiles from a template, a set of cpp
macro functions, and a per-directory input file called an Imakefile.
This allows machine dependencies (such as compiler options, alternate
command names, and special make rules) to be kept separate from the
descriptions of the various items to be built.
-%description -n imake -l pl
+%description imake -l pl
Imake jest u¿ywany do generowania plików Makefile na bazie szablonu,
zbioru makr preprocesora C oraz (dla ka¿dego podkatalogu) pliku
wej¶ciowego Imakefile. Pozwala to na oddzielenie informacji zale¿nych
nazwy komend i regu³y specjalne) od opisu ró¿nych elementów które maj±
byæ kompilowane.
-%package -n sessreg
+%package sessreg
Summary: sessreg - manage utmp/wtmp entries for non-init clients
Summary(pl): Program do zarz±dzania wpisami w utmp/wtmp
-Group: X11/XFree86
+Group: X11
+Provides: sessreg = %{epoch}:%{version}-%{release}
+Obsoletes: sessreg
-%description -n sessreg
+%description sessreg
sessreg is a simple program for managing utmp/wtmp entries for xdm
sessions.
dynamically allocates entries in the file, instead of writing them at
fixed positions indexed by position in /etc/ttys.
-%description -n sessreg -l pl
+%description sessreg -l pl
sessreg jest prostym programem do zarz±dzania wpisami w utmp/wtmp dla
sesji xdm.
alokuje wpisy w pliku, zamiast zapisywania ich na ustalonych pozycjach
indeksowanych po³o¿eniem w /etc/ttys.
-%package -n twm
+%package twm
Summary: Tab Window Manager for the X Window System
Summary(pl): Twm - podstawowy zarz±dca okien dla X Window System
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: twm = %{epoch}:%{version}-%{release}
+Obsoletes: twm
-%description -n twm
+%description twm
Twm is a window manager for the X Window System. It provides
titlebars, shaped windows, several forms of icon management,
user-defined macro functions, click-to-type and pointerdriven keyboard
focus, and user-specified key and pointer button bindings.
-%description -n twm -l pl
+%description twm -l pl
Twm jest zarz±dc± okien dla X Window System. Daje belki tytu³owe,
ramki okien, parê form zarz±dzania ikonami, definiowalne makra,
ustawianie focusu klikniêciem lub po³o¿eniem wska¼nika myszy,
definiowalne przypisania klawiszy i przycisków myszy.
-%description -n twm -l ru
+%description twm -l ru
ðÒÏÓÔÏÊ ËÏÍÐÁËÔÎÉÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ.
-%description -n twm -l uk
+%description twm -l uk
ðÒÏÓÔÉÊ ËÏÍÐÁËÔÎÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ.
-%package -n xauth
+%package xauth
Summary: xauth - X authority file utility
Summary(pl): xauth - narzêdzie do plików X authority
-Group: X11/XFree86
+Group: X11
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: xauth = %{epoch}:%{version}-%{release}
+Obsoletes: xauth
-%description -n xauth
+%description xauth
The xauth program is used to edit and display the authorization
information used in connecting to the X server. This program is
usually used to extract authorization records from one machine and
merge them in on another (as is the case when using remote logins or
granting access to other users).
-%description -n xauth -l pl
+%description xauth -l pl
Program xauth s³u¿y do edycji i wy¶wietlania informacji
-autoryzacyjnych u¿ywanych przy ³±czeniu z Xserwerem. Ten program
+autoryzacyjnych u¿ywanych przy ³±czeniu z X serwerem. Ten program
przewa¿nie jest u¿ywany do wyci±gania rekordów autoryzacji z jednej
maszyny i do³±czania ich na innej (w celu umo¿liwienia zdalnego
logowania lub udostêpnienia innym u¿ytkownikom).
-%package -n xdm
+%package xdm
Summary: xdm - X Display Manager with support for XDMCP, host chooser
Summary(pl): XDM - zarz±dca ekranów z obs³ug± XDMCP i wybieraniem hostów
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
-Group: X11/XFree86
+Group: X11
PreReq: rc-scripts
Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: pam >= 0.71
-Requires: sessreg = %{epoch}:%{version}-%{release}
+Requires: %{name}-sessreg = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
-Obsoletes: XFree86-xdm
+Provides: xdm = %{epoch}:%{version}-%{release}
+Obsoletes: entrance
Obsoletes: gdm
Obsoletes: kdm
+Obsoletes: wdm
+Obsoletes: xdm
-%description -n xdm
+%description xdm
Xdm manages a collection of X displays, which may be on the local host
or remote servers. The design of xdm was guided by the needs of X
terminals as well as the X Consortium standard XDMCP, the X Display
Manager Control Protocol.
-%description -n xdm -l pl
+%description xdm -l pl
Xdm zarz±dza zestawem ekranów X, które mog± byæ lokalne lub na
zdalnych serwerach. Zosta³ zaprojektowany zgodnie z potrzebami X
terminali oraz standardem X Consortium XDMCP.
-%description -n xdm -l ru
+%description xdm -l ru
íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X.
-%description -n xdm -l uk
+%description xdm -l uk
íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X.
-%package -n xfs
+%package xfs
Summary: Font server for XFree86
Summary(pl): Serwer fontów dla XFree86
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
-Group: X11/XFree86
+Group: X11
PreReq: rc-scripts
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(postun): /usr/sbin/userdel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: XFree86-fonts-base
-Obsoletes: XFree86-xfs
+Provides: xfs = %{epoch}:%{version}-%{release}
+Provides: group(xfs)
+Provides: user(xfs)
+Obsoletes: xfs
Obsoletes: xfsft
-%description -n xfs
+%description xfs
This is a font server for XFree86. You can serve fonts to other X
servers remotely with this package, and the remote system will be able
to use all fonts installed on the font server, even if they are not
installed on the remote computer.
-%description -n xfs -l pl
+%description xfs -l pl
Pakiet zawiera serwer fontów dla XFree86. Mo¿e udostêpniaæ fonty dla X
serwerów lokalnych lub zdalnych.
-%description -n xfs -l ru
+%description xfs -l ru
XFree86-xfs ÓÏÄÅÒÖÉÔ ÓÅÒ×ÅÒ ÛÒÉÆÔÏ× ÄÌÑ XFree86. Xfs ÔÁËÖÅ ÍÏÖÅÔ
ÐÒÅÄÏÓÔÁ×ÌÑÔØ ÛÒÉÆÔÙ ÕÄÁÌÅÎÎÙÍ X-ÓÅÒ×ÅÒÁÍ. õÄÁÌÅÎÎÁÑ ÓÉÓÔÅÍÁ ÂÕÄÅÔ
ÓÐÏÓÏÂÎÁ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÅ ÛÒÉÆÔÙ, ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÒ×ÅÒÅ ÛÒÉÆÔÏ×,
ÐÁËÅÔ(Ù) ÛÒÉÆÔÏ× XFree86, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ, Xconfigurator
É XFree86-libs.
-%description -n xfs -l uk
+%description xfs -l uk
XFree86-xfs ͦÓÔÉÔØ ÓÅÒ×ÅÒ ÛÒÉÆÔ¦× ÄÌÑ XFree86. Xfs ÔÁËÏÖ ÍÏÖÅ
ÎÁÄÁ×ÁÔÉ ÛÒÉÆÔÉ ×¦ÄÄÁÌÅÎÉÍ X-ÓÅÒ×ÅÒÁÍ. ÷¦ÄÄÁÌÅÎÁ ÓÉÓÔÅÍÁ ÚÍÏÖÅ
×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓ¦ ÛÒÉÆÔÉ, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ÓÅÒ×ÅÒ¦ ÛÒÉÆÔ¦×, ÎÁצÔØ
ÐÁËÅÔ(É) ÛÒÉÆÔ¦× XFree86, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator
ÔÁ XFree86-libs.
-#--- %prep ---------------------------
-
%prep
-%setup -qcT -b0 -b1 -b2 -b3 -b4 -b5 -b6 -b7
-
+%setup -qc -a1 -a2 -a7
%patch0 -p0
%patch1 -p1
%patch2 -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}
+%patch36 -p0
#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%{?with_tdfx:%patch39 -p0}
+%patch39 -p0
%patch40 -p1
%{!?debug:%patch41 -p1}
-%{!?with_tdfx:%patch42 -p0}
+%{!?with_glide:%patch42 -p0}
%patch43 -p0
%patch44 -p0
%patch45 -p1
%patch52 -p1
%patch53 -p0
%patch54 -p0
+%patch55 -p0
+%patch56 -p0
+%patch57 -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 %{SOURCE39} | tar x
-# ati.2 directory
-
%build
%{__make} -S -C xc World \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
ICONDIR="%{_iconsdir}" \
LINUXDIR="/dev/null"
-%ifnarch alpha
-#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
-#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" all \
-# "BOOTSTRAPCFLAGS=%{rpmcflags}" \
-# "CCOPTIONS=%{rpmcflags}" \
-# "CXXOPTIONS=%{rpmcflags}" \
-# "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
-%endif
-
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
$RPM_BUILD_ROOT/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \
- $RPM_BUILD_ROOT%{_xsessdir} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial,Bluecurve}} \
+ $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
%{__make} -C xc install install.man \
ICONDIR="%{_iconsdir}" \
LINUXDIR="/dev/null"
-%ifnarch alpha
-#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
-#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \
-# $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}
bzip2 -dc %{SOURCE42} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+# install Xrender pkgconfig metadata
+install %{SOURCE54} $RPM_BUILD_ROOT%{_pkgconfigdir}/xrender.pc
+
# twm desktop file for gdm/kdm support
install %{SOURCE46} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
+# help rpm to detect deps
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
+
%ifnarch sparc sparc64
gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
%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 \
+# (fontconfig packaged separately, DRM already in kernel)
+rm -rf $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%{_libdir}/libfontconfig.* \
+ $RPM_BUILD_ROOT%{_includedir}/fontconfig \
+ $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list} \
$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
+%post DPS -p /sbin/ldconfig
%postun DPS -p /sbin/ldconfig
-%post OpenGL-libGL -p /sbin/ldconfig
+%post OpenGL-libGL -p /sbin/ldconfig
%postun OpenGL-libGL -p /sbin/ldconfig
-%post OpenGL-libs -p /sbin/ldconfig
+%post OpenGL-libs -p /sbin/ldconfig
%postun OpenGL-libs -p /sbin/ldconfig
%post libs
ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
fi
-%post -n xdm
+%post xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
fi
-%preun -n xdm
+%preun xdm
if [ "$1" = "0" ]; then
if [ -f /var/lock/subsys/xdm ]; then
/etc/rc.d/init.d/xdm stop >&2
/sbin/chkconfig --del xdm
fi
-%pre -n xfs
-if [ -n "`/usr/bin/getgid xfs`" ]; then
- if [ "`/usr/bin/getgid xfs`" != "56" ]; then
- echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2
- exit 1
- fi
-else
- /usr/sbin/groupadd -g 56 -r -f xfs
-fi
-if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then
- if [ "`/bin/id -u xfs`" != "56" ]; then
- echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2
- exit 1
- fi
-else
- /usr/sbin/useradd -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs 1>&2
-fi
+%pre xfs
+%groupadd -P %{name}-xfs -g 56 -r -f xfs
+%useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
-%post -n xfs
+%post xfs
/sbin/chkconfig --add xfs
if [ -f /var/lock/subsys/xfs ]; then
/etc/rc.d/init.d/xfs restart >&2
echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
fi
-%preun -n xfs
+%preun xfs
if [ "$1" = "0" ]; then
if [ -f /var/lock/subsys/xfs ]; then
/etc/rc.d/init.d/xfs stop >&2
/sbin/chkconfig --del xfs
fi
-%postun -n xfs
+%postun xfs
if [ "$1" = "0" ]; then
- /usr/sbin/userdel xfs 2>/dev/null
- /usr/sbin/groupdel xfs 2>/dev/null
+ %userremove xfs
+ %groupremove xfs
fi
#--- %files --------------------------
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%{_mandir}/man1/atobm.1*
-%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man1/bitmap.1*
%{_mandir}/man1/bmtoa.1*
%{_mandir}/man1/cxpm.1*
%attr(755,root,root) %{_libdir}/libdps.so.*.*
%attr(755,root,root) %{_libdir}/libdpstk.so.*.*
%attr(755,root,root) %{_libdir}/libpsres.so.*.*
-%{_mandir}/man1/makepsres*
-%{_mandir}/man1/pswrap*
-%{_mandir}/man1/dpsexec*
-%{_mandir}/man1/dpsinfo*
+%{_mandir}/man1/makepsres.1*
+%{_mandir}/man1/pswrap.1*
+%{_mandir}/man1/dpsexec.1*
+%{_mandir}/man1/dpsinfo.1*
%files DPS-devel
%defattr(644,root,root,755)
%files OpenGL-core
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/glxgears
%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) /usr/%{_lib}/libGL.so.1
%attr(755,root,root) /usr/%{_lib}/libGL.so
+%files OpenGL-libs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/glxinfo
+%attr(755,root,root) %{_bindir}/glxgears
+%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*
+%{_mandir}/man1/glxgears.1*
+
+%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-devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libGLU.so
%{_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
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
+%ifnarch ppc sparc sparc64 sparcv9
+%attr(755,root,root) %{_bindir}/ioport
+%endif
+%attr(755,root,root) %{_bindir}/mmapr
+%attr(755,root,root) %{_bindir}/mmapw
+%attr(755,root,root) %{_bindir}/xcursor-config
+%attr(755,root,root) %{_bindir}/xft-config
%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}/libXRes.so
%attr(755,root,root) %{_libdir}/libXTrap.so
%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXcursor.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}/libXft.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}/libXp.so
%attr(755,root,root) %{_libdir}/libXpm.so
%attr(755,root,root) %{_libdir}/libXrandr.so
+%attr(755,root,root) %{_libdir}/libXrender.so
%attr(755,root,root) %{_libdir}/libXss.so
%attr(755,root,root) %{_libdir}/libXt.so
%attr(755,root,root) %{_libdir}/libXtst.so
%{_includedir}/X11/PM
%{_includedir}/X11/SM
%{_includedir}/X11/Xaw
+%{_includedir}/X11/Xcursor
+%{_includedir}/X11/Xft
%{_includedir}/X11/Xmu
%dir %{_includedir}/X11/extensions
%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
-
-%exclude %{_includedir}/X11/extensions/Xrender.h
-%exclude %{_includedir}/X11/extensions/render.h
-%exclude %{_includedir}/X11/extensions/renderproto.h
-
+%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man3/[A-FH-Z]*
-%exclude %{_mandir}/man3/Xft.3*
+%{_pkgconfigdir}/xcursor.pc
+%{_pkgconfigdir}/xft.pc
+%{_pkgconfigdir}/xrender.pc
%files Xserver-devel
%defattr(644,root,root,755)
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
-%{_mandir}/man4/apm*
+%{_mandir}/man4/apm.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
-%{_mandir}/man4/chips*
+%{_mandir}/man4/chips.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
-%{_mandir}/man4/cirrus*
+%{_mandir}/man4/cirrus.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
-%{_mandir}/man4/cyrix*
+%{_mandir}/man4/cyrix.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
%{_mandir}/man4/fbdev.4*
%endif
-%ifarch %{ix86}
-%if %{with tdfx}
+%ifarch %{ix86} ia64
+%if %{with glide}
%files driver-glide
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{_mandir}/man4/glide.4*
%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
-%{_mandir}/man4/glint*
+%{_mandir}/man4/glint.4*
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
-%{_mandir}/man4/i128*
+%{_mandir}/man4/i128.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i740
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
-%{_mandir}/man4/i740*
+%{_mandir}/man4/i740.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
+# i810_dri alone is built on x86_64 - what for?
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
-%{_mandir}/man4/i810*
+%{_mandir}/man4/i810.4*
%endif
-# Devel: %{ix86} sparc sparc64 ppc amd64
+# Devel: %{ix86} sparc sparc64 ppc %{x8664}
%if 0
%files driver-imstt
%defattr(644,root,root,755)
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha ppc arm
%files driver-mga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
-%{_mandir}/man4/mga*
+%{_mandir}/man4/mga.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
-%{_mandir}/man4/neomagic*
+%{_mandir}/man4/neomagic.4*
%endif
-# Devel: %{ix86} sparc sparc64 amd64
+# Devel: %{ix86} sparc sparc64 %{x8664}
%ifarch mips
%files driver-newport
%defattr(644,root,root,755)
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm ppc amd64
+%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
-%{_mandir}/man4/nv*
+%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
-%{_mandir}/man4/r128*
+%{_mandir}/man4/r128.4*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
-%{_mandir}/man4/radeon*
-
-%ifnarch alpha
-#%%files driver-ati.2
-#%defattr(644,root,root,755)
-#%dir %{_libdir}/modules.gatos/drivers
-#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o
-#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o
-%endif
-
-%ifnarch alpha
-#%files driver-r128.2
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o
-#%ifnarch sparc sparc64
-#%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
-#%endif
-#%%{_mandir}/man4/r128*
-%endif
-
-%ifnarch alpha
-#%files driver-radeon.2
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o
-#%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o
-#%ifnarch sparc sparc64
-#%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o
-#%endif
-%endif
+%{_mandir}/man4/radeon.4*
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%{_libdir}/modules/*.uc
-%{_mandir}/man4/rendition*
+%{_mandir}/man4/rendition.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-s3virge
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
-%{_mandir}/man4/s3virge*
+%{_mandir}/man4/s3virge.4*
%endif
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-savage
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
-%{_mandir}/man4/savage*
+%{_mandir}/man4/savage.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
-%{_mandir}/man4/siliconmotion*
+%{_mandir}/man4/siliconmotion.4*
%endif
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-sis
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
-%{_mandir}/man4/sis*
+%{_mandir}/man4/sis.4*
%endif
%ifarch sparc sparc64
%files driver-sunbw2
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
-%{_mandir}/man4/sunbw2*
+%{_mandir}/man4/sunbw2.4*
%endif
%ifarch sparc sparc64
%files driver-suncg14
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
-%{_mandir}/man4/suncg14*
+%{_mandir}/man4/suncg14.4*
%endif
%ifarch sparc sparc64
%files driver-suncg3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
-%{_mandir}/man4/suncg3*
+%{_mandir}/man4/suncg3.4*
%endif
%ifarch sparc sparc64
%files driver-suncg6
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
-%{_mandir}/man4/suncg6*
+%{_mandir}/man4/suncg6.4*
%endif
%ifarch sparc sparc64
%files driver-sunffb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+# Devel: %{ix86} ia64 (for fun?)
%attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
-%{_mandir}/man4/sunffb*
+%{_mandir}/man4/sunffb.4*
%endif
%ifarch sparc sparc64
%files driver-sunleo
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
-%{_mandir}/man4/sunleo*
+%{_mandir}/man4/sunleo.4*
%endif
%ifarch sparc sparc64
%files driver-suntcx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
-%{_mandir}/man4/suntcx*
+%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
-%if %{with tdfx}
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 mips alpha arm ppc
%files driver-tdfx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%ifarch %{ix86} alpha arm ppc
+%ifarch %{ix86} ia64 alpha arm ppc
%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
%endif
-%{_mandir}/man4/tdfx*
-%endif
+%{_mandir}/man4/tdfx.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
-%{_mandir}/man4/trident*
+%{_mandir}/man4/trident.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
-%{_mandir}/man4/tseng*
+%{_mandir}/man4/tseng.4*
%endif
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-via
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-vmware
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
-%{_mandir}/man4/vmware*
+%{_mandir}/man4/vmware.4*
%endif
%files libs
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
+%dir %{_themesdir}/Metal
+%dir %{_themesdir}/Industrial
+%dir %{_themesdir}/Bluecurve
%{_libx11dir}/XErrorDB
%{_libx11dir}/XKeysymDB
%dir %{_appdefsdir}
%lang(sk) %dir %{_appdefsdir}/sk
%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312
%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5
-%{_libx11dir}/locale
+%dir %{_libx11dir}/locale
+%{_libx11dir}/locale/[!l]*
+%{_libx11dir}/locale/locale.*
+%dir %{_libx11dir}/locale/%{_lib}
+%dir %{_libx11dir}/locale/%{_lib}/common
+%attr(755,root,root) %{_libx11dir}/locale/%{_lib}/common/*.so*
%dir %{_includedir}
%dir %{_includedir}/X11
/usr/include/X11
%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
%dir %{_soundsdir}
+%dir %{_wallpapersdir}
%dir %{_wmpropsdir}
%dir %{_xsessdir}
+%dir %{_wmstylesdir}
%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}/libXRes.so.*.*
%attr(755,root,root) %{_libdir}/libXTrap.so.*.*
%attr(755,root,root) %{_libdir}/libXaw.so.*.*
+%attr(755,root,root) %{_libdir}/libXcursor.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}/libXft.so.1.*
+%attr(755,root,root) %{_libdir}/libXft.so.2.*
%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}/libXp.so.*.*
%attr(755,root,root) %{_libdir}/libXpm.so.*.*
%attr(755,root,root) %{_libdir}/libXrandr.so.*.*
+%attr(755,root,root) %{_libdir}/libXrender.so.*.*
%attr(755,root,root) %{_libdir}/libXss.so.*.*
%attr(755,root,root) %{_libdir}/libXt.so.*.*
%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%dir %{_libdir}/modules/drivers
%attr(755,root,root) %{_libdir}/modules/*.a
%attr(755,root,root) %{_libdir}/modules/codeconv
-%ifnarch amd64
+%ifnarch %{x8664}
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
%endif
-%ifarch %{ix86} sparc sparc64 amd64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/aiptek.4*
-%{_mandir}/man4/citron*
+%{_mandir}/man4/citron.4*
%{_mandir}/man4/dmc.4*
-%{_mandir}/man4/dynapro*
+%{_mandir}/man4/dynapro.4*
+%{_mandir}/man4/elographics.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard*
-%{_mandir}/man4/microtouch*
+%{_mandir}/man4/keyboard.4*
+%{_mandir}/man4/microtouch.4*
%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/mutouch.4*
%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
-%ifnarch amd64
-%{_mandir}/man4/v4l*
+%ifnarch %{x8664}
+%{_mandir}/man4/v4l.4*
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
-%{_mandir}/man4/vga*
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
+%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} sparc sparc64 amd64
-%{_mandir}/man4/vesa*
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
+%{_mandir}/man4/vesa.4*
%endif
-%{_mandir}/man4/void*
-%{_mandir}/man4/wacom*
-%{_mandir}/man4/elographics*
-%{_mandir}/man4/mutouch*
+%{_mandir}/man4/void.4*
+%{_mandir}/man4/wacom.4*
%files setup
%defattr(644,root,root,755)
%{_libdir}/libXRes.a
%{_libdir}/libXTrap.a
%{_libdir}/libXaw.a
+%{_libdir}/libXcursor.a
%{_libdir}/libXext.a
%{_libdir}/libXfont.a
%{_libdir}/libXfontcache.a
+%{_libdir}/libXft.a
%{_libdir}/libXi.a
%{_libdir}/libXinerama.a
%{_libdir}/libXmu.a
%{_libdir}/libXp.a
%{_libdir}/libXpm.a
%{_libdir}/libXrandr.a
+%{_libdir}/libXrender.a
%{_libdir}/libXss.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%{_pixmapsdir}/xload.png
%{_pixmapsdir}/xmag.png
+%if %{with cursors}
%files -n XcursorTheme-handhelds
%defattr(644,root,root,755)
%{_iconsdir}/handhelds
%files -n XcursorTheme-whiteglass
%defattr(644,root,root,755)
%{_iconsdir}/whiteglass
+%endif
-%files -n imake
+%files imake
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/ccmakedep
%attr(755,root,root) %{_bindir}/cleanlinks
%{_mandir}/man1/makedepend.1*
%{_mandir}/man1/xmkmf.1*
-%files -n sessreg
+%files sessreg
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/sessreg
%{_mandir}/man1/sessreg.1*
-%files -n twm
+%files twm
%defattr(644,root,root,755)
%{_wmpropsdir}/twm.desktop
%{_xsessdir}/twm.desktop
%attr(755,root,root) %{_libx11dir}/twm
%{_mandir}/man1/twm.1*
-%files -n xauth
+%files xauth
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xauth
%{_mandir}/man1/xauth.1*
-%files -n xdm
+%files xdm
%defattr(644,root,root,755)
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/pam.d/xdm
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xdm
/etc/X11/xdm/pixmaps
/etc/X11/xdm/authdir
-%files -n xfs
+%files xfs
%defattr(644,root,root,755)
%attr(754,root,root) /etc/rc.d/init.d/xfs
%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs
projects / packages / XFree86.git / blobdiff