#
# TODO:
# - separate XFS to be standalone - is it possible without duplicated files?
+# - unpacked files
#
# Conditional build:
%bcond_without glide # don't build glide driver
Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼µé
Summary(pl): XFree86 Window System wraz z podstawowymi programami
-Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar
Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86
Summary(ru): âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X
+Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.4.0
-Release: 10
+Version: 4.6.0
+Release: 0.2
Epoch: 1
License: XFree86 1.1
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
+Source0: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-1.tgz
+# Source0-md5: 6c05f3486f088d01584f4517540e8d18
+Source1: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-2.tgz
+# Source1-md5: f084d12aa734c9cd83e8d2a3a4eb3e32
+Source2: ftp://ftp.xfree86.org/pub/XFree86/4.6.0/source/%{name}-%{version}-src-3.tgz
+# Source2-md5: 05450997f1876098d791a4cf9db21af8
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
-Source54: XFree86-xrender.pc
+# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Source54: %{name}-xrender.pc
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: %{name}-lock.patch
Patch47: %{name}-sparc-kbd.patch
+Patch48: %{name}-freetype-nointernals.patch
Patch50: %{name}-xterm-256colors.patch
Patch52: %{name}-kernel_headers.patch
Patch53: %{name}-stdint.patch
Patch55: %{name}-elfloader-linux-non-exec-stack.patch
Patch56: %{name}-exec-shield-GNU-stack.patch
Patch57: %{name}-libGL-exec-shield-fixes-v2.patch
+Patch58: %{name}-page_h.patch
URL: http://www.xfree86.org/
BuildRequires: /usr/bin/perl
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86} amd64 ia64
+%ifarch %{ix86} %{x8664} ia64
%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
+BuildRequires: cpp
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.159
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
%ifarch sparc sparc64
Obsoletes: X11R6.1
%endif
-ExclusiveArch: %{ix86} alpha amd64 armv4l ia64 m68k ppc sparc
+ExclusiveArch: %{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%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 OpenGL-core
Summary: OpenGL support extension modules for Xserver
Summary(pl): Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL
-Group: X11/Xserver
+Group: X11/Servers
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
%description OpenGL-core
Summary: OpenGL support for X11R6 - GL library
Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
Group: X11/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-driver-firegl
Obsoletes: XFree86-driver-nvidia
%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)
%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 = %{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-GLU-devel = 1.3
+Provides: OpenGL-GLX-devel = 1.4
+Provides: OpenGL-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-GLU-static = 1.3
+Provides: OpenGL-static = 1.4
Obsoletes: Mesa-static
%description OpenGL-static
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: XFree86-fonts-base
%description Xnest
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
Group: X11/Servers
-PreReq: xprint-initrc
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: XFree86-fonts-base
+Requires: xprint-initrc
%description Xprt
Xprt provides an X server with the print extension and special DDX
Summary(tr): XFree86 sunucusu
Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: XFree86-fonts-base
Requires: pam
Obsoletes: XFree86-Mono
drivers for VGA and VESA-compliant cards (without acceleration). Other
drivers can be found in XFree86-driver-* packages.
-%description Xserver -l de
-X-Server für die elementarsten Framebuffer-SVGA-Geräte, einschließlich
-Karten, die aus ET4000-Chips, Cirrus Logic-Chips, Chips and
-Technologies Laptop-Chips sowie Trident 8900 und 9000 Chips gebaut
-sind. Funktioniert mit Diamond Speedstar, Orchid Kelvins, STB Nitros
-und Horizons, Genoa 8500VL, den meisten Actix-Karten sowie Spider VLB
-Plus und außerdem mit vielen anderen Chips und Karten. Es lohnt sich,
-diesen Server auszuprobieren, wenn Sie Probleme haben.
-
-%description Xserver -l fr
-Serveur X pour les circuits SVGA les plus simples, dont les cartes
-construites avec les circuits ET4000, Cirrus Logic, Chips and
-Technologies laptop, Trident 8900 et 9000. Fonctionne pour les cartes
-Diamond Speedstar, Orchid Kelvins, STB Nitros et Horizons, Genoa
-8500VL, la plupart des Actix et la Spider VLB Plus. Fonctionne aussi
-pour de nombreux autres circuits et cartes. Essayez ce serveur si vous
-avez des problèmes.
-
%description Xserver -l pl
Jest to podstawowy X serwer wy¶wietlaj±cy obraz na karcie graficznej.
Do dzia³ania wymaga odpowiedniego sterownika - sam pakiet zawiera
akceleracji). Inne sterowniki mo¿na znale¼æ w pakietach
XFree86-driver-*.
-%description Xserver -l tr
-ET4000, Cirrus Logic, Chips and Technologies dizüstü, Trident 8900 ve
-9000 gibi basit 'framebuffer' SVGA kullananan kartlar için X sunucusu.
-Ayný zamanda Diamond Speedstar, Orchid Kelvins, STB Nitros / Horizons,
-Genoa 8500VL, çoðu Actix kartlarý, Spider VLB Plus gibi kartlar ve
-birçok diðer kart ile de çalýþýr. Herhangi bir sorun yaþarsanýz bu
-sunucuyu deneyin.
-
%package Xvfb
Summary: XFree86 Xvfb server
Summary(pl): Serwer XFree86 Xvfb
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
-Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: XFree86-fonts-base
%description Xvfb
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-imake = %{epoch}:%{version}-%{release}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: fontconfig-devel >= 1:1.0.0
Provides: render = 0.8
Provides: xcursor-devel = 1.0
%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 ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ
Summary: ATI Rage 128 video driver
Summary(pl): Sterownik do kart ATI Rage 128
Group: X11/Servers
-Requires: OpenGL
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.
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/Servers
-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
+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
%description driver-radeon
ATI Radeon video driver.
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
Group: X11/Servers
-Requires: OpenGL
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
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
Group: X11/Servers
-Requires: OpenGL
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
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
Group: X11/Servers
-Requires: OpenGL
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
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
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.
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.
Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4)
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
Group: X11/Libraries
-Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): grep
-Requires(postun): fileutils
+Requires(triggerpostun): sed >= 4.0
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: glibc >= 6:2.3.5-7.6
Provides: xcursor = 1.0
Provides: xft = 2.1.0
Provides: xpm
Summary: Modules with X servers extensions
Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
Group: X11/Servers
+Obsoletes: XFree86-module-PEX
+Obsoletes: XFree86-module-XIE
%description modules
Modules with X servers extensions.
Summary(pl): Motyw kursorów "handhelds"
Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-handhelds
Summary(pl): Motyw kursorów "redglass"
Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-redglass
Summary(pl): Motyw kursorów "whiteglass"
Group: Themes
Requires: XFree86-libs
-Requires: xcursor
Conflicts: XFree86 < 4.3.99.901-0.2
%description -n XcursorTheme-whiteglass
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
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: %{name}-sessreg = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/bin/sessreg
+Requires: pam >= 0.71
+Requires: rc-scripts
Provides: XDM
Provides: xdm = %{epoch}:%{version}-%{release}
-Obsoletes: X11-xdm
+Obsoletes: entrance
Obsoletes: gdm
Obsoletes: kdm
+Obsoletes: wdm
Obsoletes: xdm
%description xdm
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Group: X11
-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
+Requires(pre): /bin/id
+Requires(pre): /usr/bin/getgid
+Requires(pre): /usr/sbin/groupadd
+Requires(pre): /usr/sbin/useradd
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: XFree86-fonts-base
-Provides: xfs = %{epoch}:%{version}-%{release}
+Requires: rc-scripts
Provides: group(xfs)
Provides: user(xfs)
+Provides: xfs = %{epoch}:%{version}-%{release}
Obsoletes: xfs
Obsoletes: xfsft
%patch12 -p1
%patch13 -p1
%patch14 -p0
-%patch15 -p1
+%patch15 -p0
%patch16 -p0
#%patch17 -p1 -- not ready, is it required?
-%patch18 -p1
+#%patch18 -p1 -- obsoleted ? now theres a Makfile, not Imakefile
#%patch19 -p1 -- maybe should be updated to allow using make -j
-%patch20 -p0
+#%patch20 -p0
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
%patch26 -p1
-%patch27 -p1
+#%patch27 -p1 -- this is obsolete
%ifarch sparc sparc64
#%patch28 -p1 -- needs update
%endif
%patch29 -p0
-%patch30 -p1
-%patch32 -p1
+%patch30 -p0
+%patch32 -p0
%patch33 -p1
#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
#%patch38 -p0 -- causing problems IIRC (but not really needed)
%patch39 -p0
%patch40 -p1
-%{!?debug:%patch41 -p1}
+%{!?debug:%patch41 -p0}
%{!?with_glide:%patch42 -p0}
%patch43 -p0
%patch44 -p0
%patch45 -p1
%patch46 -p0
%patch47 -p1
+%patch48 -p1
%patch50 -p0
%patch52 -p1
%patch53 -p0
-%patch54 -p0
-%patch55 -p0
-%patch56 -p0
-%patch57 -p0
+#%patch54 -p0 -- obsoleted ?
+#%patch55 -p0 -- obsoleted ?
+#%patch56 -p0 -- check it
+#%patch57 -p0 -- obsoleted ?
+%patch58 -p0
rm -f xc/config/cf/host.def
$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},%{_wallpapersdir}} \
+ $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 \
DESTDIR="$RPM_BUILD_ROOT" \
- DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ DOCDIR="%{_docdir}/%{name}-%{version}" \
INSTBINFLAGS="-m 755" \
INSTPGMFLAGS="-m 755" \
RAWCPP="/lib/cpp" \
cd $RPM_BUILD_ROOT%{_includedir}/X11/Xserver
sh %{SOURCE45}
cd -
+install $RPM_BUILD_ROOT%{_includedir}/X11/Xserver/lib/GL/glx/*.h $RPM_BUILD_ROOT%{_includedir}
# set up PLD xdm config
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
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%{_libx11dir}/doc
+ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
rm -f $RPM_BUILD_ROOT%{_libx11dir}/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
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
# 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}/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*
# don't gzip README.* files, they are needed by XF86Setup
-gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
+gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
%endif
-# kill some stuff for cleaner build
-# (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.* \
- $RPM_BUILD_ROOT%{_includedir}/fontconfig \
- $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list} \
- $RPM_BUILD_ROOT/etc/fonts \
- $RPM_BUILD_ROOT%{_prefix}/src
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_lib}.conf
+
+# kill some stuff for cleaner build (DRM already in kernel)
+rm -rf $RPM_BUILD_ROOT%{_prefix}/src
%clean
rm -rf $RPM_BUILD_ROOT
-#--- %post{un}, %preun, %verifyscript, %trigge ----------
+#--- %post{un}, %preun, %trigger ----------
-%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
-umask 022
-grep -qs "^%{_libdir}$" /etc/ld.so.conf
-[ $? -ne 0 ] && echo "%{_libdir}" >> /etc/ld.so.conf
-/sbin/ldconfig
-
-%postun libs
-if [ "$1" = "0" ]; then
- umask 022
- grep -v "%{_libdir}" /etc/ld.so.conf > /etc/ld.so.conf.new
- mv -f /etc/ld.so.conf.new /etc/ld.so.conf
-fi
-/sbin/ldconfig
-
-%verifyscript libs
-echo -n "Looking for %{_libdir} in /etc/ld.so.conf... "
-if ! grep -q "^%{_libdir}$" /etc/ld.so.conf ; then
- echo "missing"
- echo "%{_libdir} missing from /etc/ld.so.conf" >&2
-else
- echo "found"
-fi
+%post libs -p /sbin/ldconfig
+%postun libs -p /sbin/ldconfig
%pre modules
if [ -d /etc/X11/xkb/geometry/hp ]; then
ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb
fi
+%triggerpostun libs -- XFree86-libs < 1:4.4.0-12
+sed -i -e "/^%(echo %{_libdir} | sed -e 's,/,\\/,g')$/d" /etc/ld.so.conf
+
%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 \"/sbin/service 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
+ echo "Run \"/sbin/service xdm start\" to start xdm." >&2
fi
%preun xdm
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm stop >&2
- fi
+ %service xdm stop
/sbin/chkconfig --del xdm
fi
%pre 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
+%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 xfs
/sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
%preun xfs
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs stop >&2
- fi
+ %service xfs stop
/sbin/chkconfig --del xfs
fi
/usr/lib/X11
%dir %{_bindir}
%dir %{_libdir}
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib
+%endif
%dir %{_libx11dir}
%{_libx11dir}/rgb.txt
%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) %{_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-static
%defattr(644,root,root,755)
%{_libdir}/libGL.a
%{_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
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/security/blacklist.xserver
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XF86Config
+%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
%config(missingok) /etc/security/console.apps/xserver
%files Xvfb
%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
%{_libdir}/libXdmcp.a
%{_libdir}/libfntstubs.a
%{_libdir}/liboldX.a
-%{_libdir}/libxf86config.a
+#%{_libdir}/libxf86config.a
%{_includedir}/X11/*.h
%{_includedir}/X11/ICE
%{_includedir}/X11/PM
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
+%{_mandir}/man1/bdftopcf.1*
+%{_mandir}/man3/[A-FH-Z]*
%{_pkgconfigdir}/xcursor.pc
%{_pkgconfigdir}/xft.pc
%{_pkgconfigdir}/xrender.pc
-%{_mandir}/man1/bdftopcf.1*
-%{_mandir}/man3/[A-FH-Z]*
%files Xserver-devel
%defattr(644,root,root,755)
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 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} ia64 amd64 mips ppc arm
+%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
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%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.4*
%endif
-%ifarch %{ix86} ia64 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.4*
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 mips ppc arm superh
+%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
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
%{_mandir}/man4/glint.4*
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
-# i810_dri alone is built on amd64 - what for?
+# 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
+#%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
%{_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} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
%{_mandir}/man4/mga.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 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.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} ia64 amd64 mips alpha arm ppc
+%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
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
%{_mandir}/man4/r128.4*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} ia64 amd64 alpha ppc arm
+%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.4*
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
+%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.4*
%endif
-%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
+%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} ia64 amd64 mips alpha ppc arm
+%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
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%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.4*
%endif
-%ifarch %{ix86} ia64 amd64 mips ppc arm
+%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
%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha arm ppc
+%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
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} ia64 amd64 alpha
+%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} ia64 amd64 mips ppc arm
+%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.4*
%endif
-%ifarch %{ix86} ia64 amd64
+%ifarch %{ix86} ia64 %{x8664}
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
%files libs
%defattr(644,root,root,755)
-%dir /etc/xdg
+/etc/ld.so.conf.d/*.conf
+%dir %{_sysconfdir}/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
+%dir %{_themesdir}/Metal
+%dir %{_themesdir}/Industrial
+%dir %{_themesdir}/Bluecurve
%{_libx11dir}/XErrorDB
%{_libx11dir}/XKeysymDB
%dir %{_appdefsdir}
%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.*.*
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
%attr(755,root,root) %{_libdir}/modules/*.a
-%attr(755,root,root) %{_libdir}/modules/codeconv
-%ifnarch amd64
+#%attr(755,root,root) %{_libdir}/modules/codeconv
+%ifnarch %{x8664}
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
-%ifnarch amd64
+%ifnarch %{x8664}
%{_mandir}/man4/v4l.4*
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} ia64 amd64 sparc sparc64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
%{_mandir}/man4/vesa.4*
%endif
%{_mandir}/man4/void.4*
%{_libdir}/libXaw.a
%{_libdir}/libXcursor.a
%{_libdir}/libXext.a
-%{_libdir}/libXft.a
%{_libdir}/libXfont.a
%{_libdir}/libXfontcache.a
+%{_libdir}/libXft.a
%{_libdir}/libXi.a
%{_libdir}/libXinerama.a
%{_libdir}/libXmu.a
%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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/pam.d/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xdm
%attr(754,root,root) /etc/rc.d/init.d/xdm
-%attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xdm
/var/lib/xdm
%{_appdefsdir}/Chooser
%attr(755,root,root) %{_bindir}/chooser
%{_mandir}/man1/xdm.1*
-%dir /etc/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/xdm-config
-/etc/X11/xdm/pixmaps
-/etc/X11/xdm/authdir
+%dir %{_sysconfdir}/X11/xdm
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/GiveConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/TakeConsole
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsession
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xsetup_0
+%attr(755,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xwilling
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xaccess
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xresources
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/Xservers
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xdm/xdm-config
+%{_sysconfdir}/X11/xdm/pixmaps
+%{_sysconfdir}/X11/xdm/authdir
%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
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/xfs
%dir %{_sysconfdir}/X11/fs
%attr(755,root,root) %{_libx11dir}/fs
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/fs/config
%attr(755,root,root) %{_bindir}/xfs
%attr(755,root,root) %{_bindir}/fslsfonts
projects / packages / XFree86.git / blobdiff