#
-# TODO:
-# - separate XFS to be standalone - is it possible without duplicated files?
+# TODO
+# - XDM Auth broken (can anyone confirm now with new implementation?)
+# - determine which modules can be used by video Xserver only and which
+# can be shared; review -modules not to require video Xserver, so they
+# can be used by other Xservers alone (such as Xprt)
+# - -Xprint seem to be Xprt configuration files - if they aren't used by
+# some (possibly remote) X client, merge them into -Xprt
+# - where to take dtpdmd from?
+# - http://security.gentoo.org/glsa/glsa-200509-07.xml
#
# Conditional build:
-%bcond_without tdfx # disables tdfx drivers building
-#
+%bcond_without glide # don't build glide driver
+%bcond_without r300 # r300_dri.so
+%bcond_with dualhead # apply dualhead patch
+
Summary: XOrg X11 Window System servers and basic programs
Summary(de): XOrg X11 Window-System-Server und grundlegende Programme
Summary(es): Programas básicos y servidores para el sistema de ventanas XOrg X11
Summary(ja): XOrg X11 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼µé
Summary(pl): XOrg X11 Window System wraz z podstawowymi programami
-Summary(tr): XOrg X11 Pencereleme Sistemi sunucularý ve temel programlar
Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XOrg X11
Summary(ru): âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X
+Summary(tr): XOrg X11 Pencereleme Sistemi sunucularý ve temel programlar
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
-Version: 6.7.0
-Release: 0.2
+Version: 6.9.0
+Release: 4
Epoch: 1
-License: XFree86 1.0 (?)
-Group: X11/Xorg
-Source0: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src1.tar.gz
-# Source0-md5: 22465263bae7a2e9f5ad77e172cf1ab5
-Source1: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src2.tar.gz
-# Source1-md5: 6ef4e8f7647a28f080c10ea1bcf01f79
-Source2: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
-# Source2-md5: 4c7144786522bbce383b21ace72bf669
+License: MIT/X Consortium/BSD (see README)
+Group: X11
+Source0: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src1.tar.gz
+# Source0-md5: 9cd255a090e81e2c62637122794e6150
+Source1: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src2.tar.gz
+# Source1-md5: f49a0993d89038a46556720688450479
+Source2: ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
+# Source2-md5: 4d5450bde835270632e004b25e45ef33
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
-# Source7-md5: 0a15b1c374256b5cad7961807baa3896
+# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source8: xdm.pamd
Source9: xserver.pamd
Source10: xdm.init
Source41: xconsole.png
Source42: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/XFree86-non-english-Xman-pages.tar.bz2
# Source42-md5: a184106bb83cb27c6963944d9243ac3f
-Source44: XFree86-Xserver-headers
-Source45: XFree86-Xserver-headers-links
+Source44: %{name}-Xserver-headers
+Source45: %{name}-Xserver-headers-links
Source46: twm-xsession.desktop
Source47: xcalc.desktop
Source48: xload.desktop
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: bf9b05a66798796b53ed1a050049b2ee
-Patch0: %{name}-PLD.patch
-Patch1: XFree86-HasZlib.patch
-Patch2: XFree86-DisableDebug.patch
-Patch3: %{name}-Xwrapper.patch
-Patch4: XFree86-xfs.patch
-Patch5: XFree86-xfs-fix.patch
-Patch6: XFree86-xfs-logger.patch
-Patch7: XFree86-xterm-utempter.patch
-Patch8: XFree86-app_defaults_dir.patch
-Patch9: XFree86-v4l.patch
-Patch10: XFree86-broken-includes.patch
-Patch11: XFree86-alpha-pcibus-lemming.patch
-Patch12: XFree86-fhs.patch
-Patch13: XFree86-xdmsecurity.patch
-Patch14: XFree86-xman.patch
-Patch15: XFree86-HasXdmAuth.patch
-Patch16: XFree86-xdm-fixes.patch
-Patch17: XFree86-imake-kernel-version.patch
-Patch18: XFree86-no-kernel-modules.patch
-Patch19: XFree86-parallelmake.patch
-Patch20: XFree86-pic.patch
-Patch21: XFree86-r128-busmstr2.patch
-Patch22: XFree86-neomagic_swcursor.patch
-Patch23: XFree86-mga-busmstr.patch
-Patch24: XFree86-agpgart-load.patch
-Patch26: XFree86-HasFreetype2.patch
-Patch27: XFree86-config-s3.patch
-Patch28: XFree86-sparc_pci_domains.patch
-Patch29: XFree86-XTerm.ad.patch
-Patch30: XFree86-alpha_GLX_align_fix.patch
-Patch32: XFree86-xman-manpaths.patch
-Patch33: XFree86-clearrts.patch
-Patch34: XFree86-fix-07-s3trio64v2gx+netfinity.patch
-Patch35: XFree86-i740-driver-update-cvs-20020617.patch
-Patch36: XFree86-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch38: XFree86-tdfx-fix-compiler-warnings.patch
-Patch39: XFree86-tdfx-fix-vtswitch-font-corruption.patch
-Patch40: XFree86-Xfont-Type1-large-DoS.patch
-# "strip -g libGLcore.a" leaves empty objects m_debug_*.o, which cause
-# warnings during GLcore loading ("m_debug_*.o: no symbols") - shut up them
-Patch41: XFree86-GLcore-strip-a-workaround.patch
-Patch42: %{name}-disable_glide.patch
-Patch43: XFree86-expat.patch
-Patch44: XFree86-pkgconfig.patch
-# spencode.o in libspeedo.a is empty - patch like for libGLcore.a
-Patch45: XFree86-spencode-nowarning.patch
-# Small (maybe buggy) patch to resolve problems with totem 0.97.0
-Patch46: XFree86-lock.patch
-Patch47: XFree86-sparc-kbd.patch
-Patch50: %{name}-xterm-256colors.patch
-Patch52: XFree86-kernel_headers.patch
-Patch53: XFree86-stdint.patch
+# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Patch1: %{name}-PLD.patch
+Patch2: %{name}-enableglide.patch
+Patch3: %{name}-DisableDebug.patch
+Patch4: %{name}-Xwrapper.patch
+Patch5: %{name}-xfs.patch
+Patch6: %{name}-xterm-utempter.patch
+Patch7: %{name}-app_defaults_dir.patch
+Patch8: %{name}-broken-includes.patch
+Patch9: %{name}-fhs.patch
+Patch10: %{name}-xdmsecurity.patch
+Patch11: %{name}-xman.patch
+Patch12: %{name}-xdm-fixes.patch
+Patch13: %{name}-pic.patch
+Patch14: %{name}-r128-busmstr2.patch
+Patch15: %{name}-neomagic_swcursor.patch
+Patch16: %{name}-mga-busmstr.patch
+Patch17: %{name}-agpgart-load.patch
+Patch18: %{name}-XTerm.ad.patch
+Patch19: %{name}-llh.patch
+Patch20: XFree86-xman-manpaths.patch
+Patch21: %{name}-clearrts.patch
+Patch22: XFree86-Xfont-Type1-large-DoS.patch
+Patch23: %{name}-GLcore-strip-a-workaround.patch
+Patch24: %{name}-pkgconfig.patch
+Patch25: XFree86-spencode-nowarning.patch
+Patch26: %{name}-xterm-256colors.patch
+Patch27: %{name}-makefile-fastbuild.patch
+Patch28: %{name}-dri-ffb-compile.patch
+Patch29: %{name}-radeon-entervt.patch
+Patch30: %{name}-acpi_event_loop_fix.patch
+# updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
+Patch31: %{name}-i810fb.patch
+Patch50: %{name}-glibc-locale_sync.patch
+Patch60: %{name}-oldkeyb.patch
+Patch61: %{name}-sparc64-asmfix.patch
+Patch62: %{name}-sparc64-v9fix.patch
+Patch63: %{name}-pci-build.patch
+Patch64: %{name}-xkbcomp-level.patch
+# XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
+# but patch doesn't help either; however, it occurs in text mode only, not
+# with tdfxfb, which is worth using anyway
+
+# radeon
+Patch69: %{name}-radeon-dynamic-clocks.patch
+Patch71: %{name}-radeon-set-fb-location.patch
+Patch72: http://glen.alkohol.ee/xkb/xorg.patch
+Patch73: %{name}-r300.patch
+Patch74: %{name}-unichrome.patch
+
+#head-patch
+#ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
+Patch100: ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/xorg-x11-6.8.1-dualhead.patch
+
URL: http://www.x.org/
BuildRequires: /usr/bin/perl
-%ifarch %{ix86} alpha amd64
-%{?with_tdfx:BuildRequires: Glide3-DRI-devel}
-%endif
# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c
-%ifarch %{ix86} amd64
-%{?with_tdfx:BuildRequires: Glide2x_SDK}
+%ifarch %{ix86} %{x8664} ia64
+%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
+BuildRequires: cpp
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.143
-BuildRequires: tcl-devel
+BuildRequires: rpmbuild(macros) >= 1.213
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-Requires: %{name}-libs = %{epoch}:%{version}
-Requires: xauth
-Requires: pam >= 0.77.3
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
+Requires: pam >= 0.79.0
+Provides: XFree86 = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86
Obsoletes: xpm-progs
Obsoletes: xterm
-%ifarch sparc sparc64
+# for /usr/X11R6/bin/mkfontdir
+Obsoletes: XFree86-font-utils
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1
%endif
-Provides: XFree86 = %{epoch}:%{version}-%{release}
+ExclusiveArch: %{ix86} %{x8664} alpha armv4l ia64 m68k ppc sparc sparc64 sparcv9
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%define _soundsdir /usr/share/sounds
+%define _wallpapersdir /usr/share/wallpapers
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
+%define _wmstylesdir /etc/sysconfig/wmstyle
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
Pakiet ten nie zawiera X serwera który jest po¶rednikiem z Twoj± kart±
graficzn± (jest on w innym pakiecie).
-%description -l tr
-X Window sistemi, çoklu pencere, çoklu istemci ve çeþitli pencere
-stilleriyle geniþ özelliklere sahip bir Grafik Kullanýcý Arabirimidir.
-Çoðu UNIX sisteminde çalýþtýðý gibi istemcileri de birçok pencereleme
-sistemiyle çalýþabilir. X protokolu kullanan uygulamalarýn yerel
-makina veya bilgisayar aðý üzerinden çalýþtýrýlabilmesi esnek bir
-istemci/sunucu ortamý saðlar. Bu paket bir X istasyonu için gerekli
-olan temel yazýtiplerini, programlarý ve belgeleri sunar. Ekran
-kartýnýzý sürmek için gerekli olan X sunucusu bu pakete dahil
-deðildir.
-
%description -l pt_BR
X Window é uma interface gráfica completa com múltiplas janelas,
múltiplos clientes e diferentes estilos de janelas. É usado na maioria
îÕ É, ÎÁËÏÎÅÃ, ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÉÌÏÖÅÎÉÑ,
ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, ×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ X11-devel.
+%description -l tr
+X Window sistemi, çoklu pencere, çoklu istemci ve çeþitli pencere
+stilleriyle geniþ özelliklere sahip bir Grafik Kullanýcý Arabirimidir.
+Çoðu UNIX sisteminde çalýþtýðý gibi istemcileri de birçok pencereleme
+sistemiyle çalýþabilir. X protokolu kullanan uygulamalarýn yerel
+makina veya bilgisayar aðý üzerinden çalýþtýrýlabilmesi esnek bir
+istemci/sunucu ortamý saðlar. Bu paket bir X istasyonu için gerekli
+olan temel yazýtiplerini, programlarý ve belgeleri sunar. Ekran
+kartýnýzý sürmek için gerekli olan X sunucusu bu pakete dahil
+deðildir.
+
%description -l uk
X Window System ÎÁÄÁ¤ ÂÁÚÕ ÄÌÑ ÒÏÚÒÏÂËÉ ÇÒÁƦÞÎÉÈ ¦ÎÔÅÒÆÅÊÓ¦×
ËÏÒÉÓÔÕ×ÁÞÁ. ðÒÏÓÔ¦ÛÅ ËÁÖÕÞÉ, X ÍÁÌÀ¤ ÅÌÅÍÅÎÔÉ GUI ÎÁ ÅËÒÁΦ
%package common
Summary: XOrg X11 files required both on server and client side
Summary(pl): Pliki XOrg X11 wymagane zarówno po stronie serwera jak i klienta
-Group: X11/Xorg
+Group: X11
Provides: XFree86-common = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-common
%description common
XOrg X11 files required both on server and client side.
%description common -l pl
Pliki XOrg X11 wymagane zarówno po stronie serwera jak i klienta.
+%package Xprint
+Summary: Xprint tool
+Summary(pl): Narzêdzie Xprint
+Group: X11
+# for /etc/X11/xserver
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description Xprint
+Xprint tool.
+
+%description Xprint -l pl
+Narzêdzie Xprint.
+
%package DPS
Summary: Display PostScript
Summary(pl): Display PostScript
-Group: X11/Xorg
+Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
-Obsoletes: dgs
Provides: XFree86-DPS = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS
+Obsoletes: dgs
%description DPS
X-Window Display PostScript is device-independent imaging model for
%package DPS-devel
Summary: Header files for Display PostScript
Summary(pl): Pliki nag³ówkowe dla Display PostScript
-Group: X11/Xorg
+Group: X11/Development/Libraries
Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Obsoletes: dgs-devel
Provides: XFree86-DPS-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-devel
+Obsoletes: dgs-devel
%description DPS-devel
Header files for develop X-Window Display Postscript.
%package DPS-static
Summary: Display PostScript static libraries
Summary(pl): Biblioteki statyczne Display PostScript
-Group: X11/Xorg
+Group: X11/Development/Libraries
Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
-Obsoletes: dgs-static
Provides: XFree86-DPS-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-static
+Obsoletes: dgs-static
%description DPS-static
X-Window Display PostScript static libraries.
Statyczne biblioteki X-Window Display PostScript.
%package OpenGL-core
-Summary: OpenGL support for X11R6
-Summary(pl): Wsparcie OpenGL dla systemu X11R6
-Group: XFree86/Libraries
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: X11-OpenGL-libGL
+Summary: OpenGL support extension modules for Xserver
+Summary(pl): Modu³y rozszerzeñ X serwera obs³uguj±ce OpenGL
+Group: X11/Servers
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-core
%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: XFree86/Libraries
-Requires: X11-OpenGL-core = %{epoch}:%{version}-%{release}
-Obsoletes: X11-driver-firegl
+Group: X11/Libraries
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Obsoletes: X11-driver-firegl
+Obsoletes: X11-driver-nvidia
+Obsoletes: XFree86-Mesa-libGL
+Obsoletes: XFree86-OpenGL-libGL
+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: glxMesa-devel
-Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
+%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.5
+Provides: OpenGL-GLU = 1.3
+Provides: OpenGL-GLX = 1.4
+Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
+Obsoletes: Mesa
+Obsoletes: XFree86-OpenGL-libs
-%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}-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-devel-base
Provides: XFree86-OpenGL-devel-base = %{epoch}:%{version}-%{release}
+Obsoletes: X11-driver-nvidia-devel
+Obsoletes: XFree86-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: XFree86/Libraries
-Requires: %{name}-OpenGL-core
-Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: OpenGL
-Obsoletes: Mesa
-Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
+%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.5
+Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
+Obsoletes: Mesa-devel
+Obsoletes: XFree86-OpenGL-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
-Obsoletes: Mesa-static
+Provides: OpenGL-GLU-static = 1.3
+Provides: OpenGL-static = 1.5
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
+Obsoletes: Mesa-static
+Obsoletes: XFree86-OpenGL-static
%description OpenGL-static
X11R6 static libraries with OpenGL.
Summary(pl): Serwer XOrg X11 Xnest
Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XOrg X11
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XOrg X11
-Group: X11/Xorg/Servers
+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: X11-fonts-base
Provides: XFree86-Xnest = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xnest
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
%package Xprt
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
-Group: X11/Xorg/Servers
-PreReq: xprint-initrc
+Group: X11/Servers
+Requires: %{name}-Xprint = %{epoch}:%{version}-%{release}
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: X11-fonts-base
+Requires: xprint-initrc
+Provides: XFree86-Xprt = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xprt
%description Xprt
Xprt provides an X server with the print extension and special DDX
Summary(fr): Serveur XOrg X11
Summary(pl): Serwer XOrg X11
Summary(tr): XOrg X11 sunucusu
-Group: X11/Xorg/Servers
+Group: X11/Servers
+Requires(pre): sed >= 4.0
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: X11-fonts-base
-Requires: pam
-Obsoletes: X11-Mono
-Obsoletes: X11-SVGA
-Obsoletes: X11-VGA16
+Requires: pam >= 0.79.0
+Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Mono
+Obsoletes: XFree86-SVGA
+Obsoletes: XFree86-VGA16
# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
-Obsoletes: X11-Sun
-Obsoletes: X11-Sun24
+Obsoletes: XFree86-Sun
+Obsoletes: XFree86-Sun24
# still not supported in 4.2.0:
-#Obsoletes: X11-Mach8 X11-8514 X11-AGX X11-P9000
+#Obsoletes: XFree86-8514
+#Obsoletes: XFree86-AGX
+#Obsoletes: XFree86-Mach8
+#Obsoletes: XFree86-P9000
# (and many drivers from XF86_SVGA server... and some from others)
+Obsoletes: XFree86-XF86Setup
+Obsoletes: XFree86-Xserver
Obsoletes: Xconfigurator
-Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
%description Xserver
Generally used X server which uses display hardware. It requires
drivers for VGA and VESA-compliant cards (without acceleration). Other
drivers can be found in X11-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 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 X11-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: XOrg X11 Xvfb server
Summary(pl): Serwer XOrg X11 Xvfb
Summary(ru): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
-Group: X11/Xorg/Servers
+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: X11-fonts-base
+Provides: XFree86-Xvfb = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xvfb
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
Group: X11/Development/Libraries
+Requires: %{name}-imake = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: imake = %{epoch}:%{version}-%{release}
+Requires: fontconfig-devel >= 1:2.2.0
+Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Provides: libXvMCW-devel
+Provides: render = 0.8
+Provides: xcursor-devel = 1.1.2
+Provides: xft-devel = 2.1.6
Provides: xpm-devel
-Obsoletes: xpm-devel
-%ifarch sparc sparc64
+Provides: xrender-devel = 0.8.4
+# don't use package names from xlibs implementation as metapackages
+#Provides: libXcomposite-devel
+#Provides: libXdamage-devel
+#Provides: libXfixes-devel
+#Provides: libXrender-devel
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-devel
%endif
-Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-devel
+Obsoletes: XFree86-render
+Obsoletes: XFree86-xcursor-devel
+Obsoletes: XFree86-xft-devel
+Obsoletes: XFree86-xft2-devel
+Obsoletes: XFree86-xrender-devel
+Obsoletes: Xft-devel
+Obsoletes: libXvMCW-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
X11-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: XFree86-Xserver-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xserver-devel
%description Xserver-devel
Header files for XOrg X11 Xserver drivers and extensions development.
%package driver-apm
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Alliance
+Obsoletes: XFree86-driver-apm
%description driver-apm
Alliance Promotion driver.
%package driver-ark
Summary: Ark Logic video driver
Summary(pl): Sterownik do kart Ark Logic
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ark
%description driver-ark
Ark Logic driver.
%package driver-ati
Summary: ATI video driver
Summary(pl): Sterownik do kart ATI
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-i2c = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
+Obsoletes: XFree86-driver-ati
%description driver-ati
ATI video driver.
%package driver-r128
Summary: ATI Rage 128 video driver
Summary(pl): Sterownik do kart ATI Rage 128
-Group: X11/Xorg
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: X11-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-Rage128
+Obsoletes: XFree86-driver-r128
%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/Xorg
-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: X11-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
+Obsoletes: XFree86-driver-radeon
%description driver-radeon
ATI Radeon video driver.
%package driver-chips
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-ChipsTechnologies
+Obsoletes: XFree86-driver-chips
%description driver-chips
Chips and Technologies video driver.
%package driver-cirrus
Summary: Cirrus Logic video driver
Summary(pl): Sterownik do kart Cirrus Logic
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Cirrus
+Obsoletes: XFree86-driver-cirrus
%description driver-cirrus
Cirrus Logic video driver.
%package driver-cyrix
Summary: Cyrix video driver
Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Cyrix
+Obsoletes: XFree86-driver-cyrix
%description driver-cyrix
Cyrix video driver.
%package driver-fbdev
Summary: Video driver for framebuffer device
Summary(pl): Sterownik korzystaj±cy z framebuffera
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-FBDev
+Obsoletes: XFree86-driver-fbdev
%description driver-fbdev
Non-accelerated video driver for framebuffer device.
%package driver-ffb
Summary: Video driver for DRI sparc framebuffer device
Summary(pl): Sterownik do framebuffera DRI na sparc
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ffb
%description driver-ffb
Video driver for DRI sparc framebuffer device.
%package driver-glide
Summary: 3Dfx Voodoo1 and Voodoo2 video driver
Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
# dlopens libglide2x.so
Requires: Glide_VG
+Obsoletes: XFree86-driver-glide
%description driver-glide
Voodoo1 and Voodoo2 video driver.
%package driver-glint
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
-Group: X11/Xorg
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: X11-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
+Obsoletes: XFree86-driver-glint
%description driver-glint
GLINT/Permedia video driver.
%package driver-i128
Summary: Number 9 I128 video driver
Summary(pl): Sterownik do kart Number 9 I128
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-I128
+Obsoletes: XFree86-driver-i128
%description driver-i128
Number 9 I128 video driver.
%description driver-i128 -l pl
Sterownik do kart Number 9 I128.
+%package driver-i2c
+Summary: I2C drivers
+Summary(pl): Sterowniki I2C
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-i2c
+I2C drivers.
+
+%description driver-i2c -l pl
+Sterowniki I2C.
+
%package driver-i740
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-i740
+Obsoletes: XFree86-i740
%description driver-i740
Intel i740 video driver.
%package driver-i810
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
-Group: X11/Xorg
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: X11-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-driver-i810
+Obsoletes: XFree86-i810
%description driver-i810
Intel i810/i815/i830 video driver.
%package driver-imstt
Summary: Integrated Micro Solutions Twin Turbo 128 driver
Summary(pl): Sterownik do kart Integrated Micro Solutions Twin Turbo 128
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-imstt
%description driver-imstt
Integrated Micro Solutions Twin Turbo 128 driver.
%package driver-mga
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
-Group: X11/Xorg
-Requires: OpenGL
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: X11-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-driver-mga
+Obsoletes: XFree86-mga
%description driver-mga
Matrox video driver.
%package driver-neomagic
Summary: NeoMagic video driver
Summary(pl): Sterownik do kart NeoMagic
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-NeoMagic
+Obsoletes: XFree86-driver-neomagic
%description driver-neomagic
NeoMagic video driver.
%package driver-newport
Summary: Newport (XL) adapters video driver
Summary(pl): Sterownik do kart Newport (XL)
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-newport
%description driver-newport
Newport (XL) adapters video driver (found primarily in SGI Indy and
%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/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-nsc
%description driver-nsc
National Semiconductors GEODE family video driver. Supports GXLV (5530
%package driver-nv
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-NVidia
+Obsoletes: XFree86-driver-nv
%description driver-nv
nVidia video driver. Supports Riva128, RivaTNT, GeForce.
%package driver-rendition
Summary: Rendition video driver
Summary(pl): Sterownik do kart Rendition
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Rendition
+Obsoletes: XFree86-driver-rendition
%description driver-rendition
Rendition/Micron video driver.
%package driver-s3virge
Summary: S3 ViRGE/Trio3D video driver
Summary(pl): Sterownik do kart na uk³adach S3 ViRGE i Trio3D
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-S3V
+Obsoletes: XFree86-driver-s3virge
%description driver-s3virge
S3 ViRGE/Trio3D video driver.
%package driver-s3
Summary: S3 Trio video driver
Summary(pl): Sterownik do kart na uk³adach S3 Trio
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-S3
+Obsoletes: XFree86-driver-s3
%description driver-s3
S3 Trio video driver.
%package driver-savage
Summary: S3 Savage video driver
Summary(pl): Sterownik do kart na uk³adach S3 Savage
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-savage
%description driver-savage
S3 Savage video driver.
%package driver-siliconmotion
Summary: Silicon Motion video driver
Summary(pl): Sterownik do kart na uk³adach Silicon Motion
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-siliconmotion
%description driver-siliconmotion
Silicon Motion video driver.
%package driver-sis
Summary: SiS video driver
Summary(pl): Sterownik do kart na uk³adach SiS
-Group: X11/Xorg
+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
+Obsoletes: XFree86-driver-sis
%description driver-sis
SiS video driver.
%description driver-sis -l pl
Sterownik do kart na uk³adach SiS.
+%package driver-sisusb
+Summary: Video driver for SiS video chips connected via a Net2280-based USB dongle
+Summary(pl): Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB Net2280
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-sisusb
+Video driver for SiS video chips connected via a Net2280-based USB
+dongle. It supports SiS315E/PRO video chipset.
+
+Note: it requires a Linux kernel driver (included in Linux 2.6.12 and
+later).
+
+%description driver-sisusb -l pl
+Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB
+opart± na uk³adzie Net2280. Obs³uguje uk³ad graficzny SiS315E/PRO.
+
+Uwaga: wymaga sterownika j±dra Linuksa (za³±czonego w wersji Linuksa
+2.6.12 i pó¼niejszych).
+
%package driver-sunbw2
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-SunMono
+Obsoletes: XFree86-driver-sunbw2
%description driver-sunbw2
sunbw2 - Sun BW2 video driver.
%package driver-suncg14
Summary: suncg14 - Sun CG14 video driver
Summary(pl): Sterownik do kolorowego framebuffera CG14 na Sunie
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg14
%description driver-suncg14
suncg14 - Sun CG14 video driver.
%package driver-suncg3
Summary: suncg3 - Sun CG3 video cards driver
Summary(pl): Sterownik do kolorowego framebuffera CG3 na Sunie
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg3
%description driver-suncg3
suncg3 - Sun CG3 video cards driver.
%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/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg6
%description driver-suncg6
suncg6 - Sun GX and Turbo GX video driver.
%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/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunffb
%description driver-sunffb
sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
%package driver-sunleo
Summary: sunleo - Sun Leo (ZX) video cards driver
Summary(pl): Sterownik do kart Sun Leo (ZX)
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunleo
%description driver-sunleo
sunleo - Sun Leo (ZX) video cards driver.
%package driver-suntcx
Summary: suntcx - Sun TCX video cards driver
Summary(pl): Sterownik do kart Sun TCX
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suntcx
%description driver-suntcx
suntcx - Sun TCX video cards driver.
%package driver-tdfx
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
-Group: X11/Xorg
+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
-Conflicts: X11-driver-nvidia
+%endif
+Obsoletes: XFree86-3dfx
+Obsoletes: XFree86-driver-tdfx
%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/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-TGA
+Obsoletes: XFree86-driver-tga
%description driver-tga
TGA video driver.
%package driver-trident
Summary: Trident video driver
Summary(pl): Sterownik do kart Trident
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Trident
+Obsoletes: XFree86-driver-trident
%description driver-trident
Trident video driver.
%package driver-tseng
Summary: Tseng Labs video driver
Summary(pl): Sterownik do kart Tseng Labs
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Tseng
+Obsoletes: XFree86-W32
+Obsoletes: XFree86-driver-tseng
%description driver-tseng
Tseng Labs video driver.
%package driver-via
Summary: VIA CLE266 driver
Summary(pl): Sterownik do kart VIA CLE266
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-via
%description driver-via
VIA CLE266 driver.
%package driver-vmware
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
-Group: X11/Xorg
+Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-vmware
%description driver-vmware
VMware emulated SVGA video driver. Necessary if you run Linux on
Summary(pt_BR): Bibliotecas compartilhadas X11R6
Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4)
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
-Group: X11/Xorg
+Group: X11/Libraries
Requires(post,postun): /sbin/ldconfig
-Requires(post,postun): grep
-Requires(postun): fileutils
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Requires: glibc >= 6:2.3.5-7.6
+Provides: XFree86-libs = %{epoch}:%{version}-%{release}
+#Provides: libXcomposite
+#Provides: libXdamage
+#Provides: libXfixes
+#Provides: libXrender
+Provides: libXvMCW
+Provides: xcursor = 1.1.2
+Provides: xft = 2.1.6
Provides: xpm
-Obsoletes: xpm
-%ifarch sparc sparc64
+Provides: xrender = 0.8.4
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-libs
%endif
-Provides: XFree86-libs = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-libs
+Obsoletes: XFree86-xcursor
+Obsoletes: XFree86-xft
+Obsoletes: XFree86-xft2
+Obsoletes: XFree86-xrender
+Obsoletes: Xft
+Obsoletes: libXvMCW
+Obsoletes: xcursor
+Obsoletes: xft
+Obsoletes: xorg-x11-libs-data
+Obsoletes: xpm
+Obsoletes: xrender
%description libs
X11-libs contains the shared libraries that most X programs need to
%package modules
Summary: Modules with X servers extensions
Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
-Group: X11/Xorg
+Group: X11/Servers
+Provides: XFree86-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-module-PEX
+Obsoletes: XFree86-module-XIE
+Obsoletes: XFree86-modules
%description modules
Modules with X servers extensions.
Summary(pl): Graficzny konfigurator dla XOrg X11
Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XOrg X11
Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XOrg X11
-Group: X11/Xorg
+Group: X11
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes: X11-xf86cfg
+Provides: XFree86-setup = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-setup
+Obsoletes: XFree86-xf86cfg
%description setup
Setup containst a configuration tool for the XOrg X11 family of
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-%ifarch sparc sparc64
+Provides: XFree86-static = %{epoch}:%{version}-%{release}
+Provides: xcursor-static = 1.1.2
+Provides: xft-static = 2.1.6
+Provides: xpm-static
+Provides: xrender-static = 0.8.4
+%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-devel
%endif
+Obsoletes: XFree86-static
+Obsoletes: XFree86-xcursor-static
+Obsoletes: XFree86-xft-static
+Obsoletes: XFree86-xrender-static
+Obsoletes: Xft-devel
+Obsoletes: xcursor-static
+Obsoletes: xft-static
Obsoletes: xpm-static
-Provides: XFree86-static = %{epoch}:%{version}-%{release}
+Obsoletes: xrender-static
%description static
X11R6 static libraries.
Summary(pl): Ró¿ne narzêdzia dla XOrg X11
Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XOrg X11
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XOrg X11
-Group: X11/Xorg
+Group: X11
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
-Obsoletes: X11R6-contrib
Provides: XFree86-tools = %{epoch}:%{version}-%{release}
+Obsoletes: X11R6-contrib
+Obsoletes: XFree86-tools
%description tools
Various tools for X, including listres, xbiff, xedit, xeyes, xcalc,
%package -n XcursorTheme-handhelds
Summary: Cursors Theme "handhelds"
Summary(pl): Motyw kursorów "handhelds"
-Group: X11/Themes
-Requires: X11-libs
-Requires: xcursor
+Group: Themes
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
+Obsoletes: XFree86-Xcursor-packs-handhelds
%description -n XcursorTheme-handhelds
Cursors theme "handhelds" for X11.
%package -n XcursorTheme-redglass
Summary: Cursors theme "redglass"
Summary(pl): Motyw kursorów "redglass"
-Group: X11/Themes
-Requires: X11-libs
-Requires: xcursor
+Group: Themes
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
+Obsoletes: XFree86-Xcursor-packs-redglass
%description -n XcursorTheme-redglass
Cursors theme "redglass" for X11.
%package -n XcursorTheme-whiteglass
Summary: Cursors theme "whiteglass"
Summary(pl): Motyw kursorów "whiteglass"
-Group: X11/Themes
-Requires: X11-libs
-Requires: xcursor
+Group: Themes
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
+Obsoletes: XFree86-Xcursor-packs-whiteglass
%description -n XcursorTheme-whiteglass
Cursors theme "whiteglass" for X11.
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Group: Development/Building
Provides: imake = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-imake
+Obsoletes: imake
%description imake
Imake is used to generate Makefiles from a template, a set of cpp
%package sessreg
Summary: sessreg - manage utmp/wtmp entries for non-init clients
Summary(pl): Program do zarz±dzania wpisami w utmp/wtmp
-Group: X11/Xorg
+Group: X11
Provides: sessreg = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-sessreg
+Obsoletes: sessreg
%description sessreg
sessreg is a simple program for managing utmp/wtmp entries for xdm
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Provides: twm = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-twm
+Obsoletes: twm
%description twm
Twm is a window manager for the X Window System. It provides
%package xauth
Summary: xauth - X authority file utility
Summary(pl): xauth - narzêdzie do plików X authority
-Group: X11/Xorg
+Group: X11
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: xauth = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-xauth
+Obsoletes: xauth
%description xauth
The xauth program is used to edit and display the authorization
%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).
Summary(pl): XDM - zarz±dca ekranów z obs³ug± XDMCP i wybieraniem hostów
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
-Group: X11/Xorg
-PreReq: rc-scripts
+Group: X11
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
+Requires: pam >= 0.79.0
+Requires: rc-scripts
Provides: XDM
-Obsoletes: gdm
Provides: xdm = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-xdm
+Obsoletes: entrance
+Obsoletes: gdm
+Obsoletes: kdm
+Obsoletes: wdm
+Obsoletes: xdm
%description xdm
Xdm manages a collection of X displays, which may be on the local host
Summary(pl): Serwer fontów dla XOrg X11
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
-Group: X11/Xorg
-PreReq: rc-scripts
-Requires(pre): /bin/id
-Requires(pre): /usr/bin/getgid
-Requires(pre): /usr/sbin/useradd
-Requires(pre): /usr/sbin/groupadd
+Group: X11
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: X11-fonts-base
-Obsoletes: xfsft
+Requires: rc-scripts
+Provides: group(xfs)
+Provides: user(xfs)
Provides: xfs = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-xfs
+Obsoletes: xfs
+Obsoletes: xfsft
+Obsoletes: xorg-x11-xfs
%description xfs
This is a font server for XOrg X11. You can serve fonts to other X
ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
X11-libs.
-#--- %prep ---------------------------
-
%prep
%setup -qc -a1 -a2 -a7
-%patch0 -p0
%patch1 -p1
-%patch2 -p1
+%{?with_glide:%patch2 -p0}
%patch3 -p0
%patch4 -p1
%patch5 -p0
%patch6 -p0
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
+%patch7 -p0
+%patch8 -p0
+%patch9 -p0
%patch10 -p0
-#%patch11 -p0 -- obsoleted???
-%patch12 -p1
-%patch13 -p1
+%patch11 -p0
+%patch12 -p0
+%patch13 -p0
%patch14 -p0
-%patch15 -p1
+%patch15 -p0
%patch16 -p0
-#%patch17 -p1 -- not ready, is it required?
-%patch18 -p1
-#%patch19 -p1 -- maybe should be updated to allow using make -j
-%patch20 -p0
+%patch17 -p0
+%patch18 -p0
+%patch19 -p1
+%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
-%patch24 -p1
-%patch26 -p1
-%patch27 -p1
-%ifarch sparc sparc64
-#%patch28 -p1 -- needs update
-%endif
-%patch29 -p0
-%patch30 -p1
-%patch32 -p1
-%patch33 -p1
-#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
-#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
-%{?with_tdfx:%patch36 -p0}
-#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%{?with_tdfx:%patch39 -p0}
-%patch40 -p1
-%{!?debug:%patch41 -p1}
-%{!?with_tdfx:%patch42 -p0}
-%patch43 -p0
-%patch44 -p0
-%patch45 -p1
-%patch46 -p0
-%patch47 -p1
-%patch50 -p0
-%patch52 -p1
-%patch53 -p0
+%patch24 -p0
+%patch25 -p1
+%patch26 -p0
+%patch27 -p0
+%patch28 -p1
rm -f xc/config/cf/host.def
+%patch29 -p1
+%patch30 -p0
+%patch31 -p0
+# ankry, FIXME :)
+# %patch50 -p1
+%patch60 -p0
+# FIXME
+# %patch61 -p1
+%patch62 -p1
+%patch63 -p1
+%patch64 -p1
+
+# FIXME, is this still needed?
+# %patch69 -p0
+# FIXME, is this still needed?
+# %patch71 -p0
+%{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
+
+%{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
+%{?with_dualhead:%patch100 -p1}
+
+sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
+ xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
+
%build
+PWD=`pwd`
%{__make} -S -C xc World \
+ FAST=1 \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
CC="%{__cc}" \
BOOTSTRAPCFLAGS="%{rpmcflags}" \
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
+ FONTSDIR= \
ICONDIR="%{_iconsdir}" \
- LINUXDIR="/dev/null"
+ LINUXDIR="/dev/null" \
+ TOP="$PWD/xc"
%install
rm -rf $RPM_BUILD_ROOT
$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}} \
+ $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
+PWD=`pwd`
%{__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" \
CXXOPTIONS="%{rpmcflags}" \
CXXDEBUGFLAGS="" \
CDEBUGFLAGS="" \
+ FONTSDIR= \
ICONDIR="%{_iconsdir}" \
- LINUXDIR="/dev/null"
+ LINUXDIR="/dev/null" \
+ TOP="$PWD/xc"
# fix pkgconfig path
if [ "%{_pkgconfigdir}" != "/usr/lib/pkgconfig" ] ; then
# setting default X
rm -f $RPM_BUILD_ROOT%{_bindir}/X
-ln -sf X11 $RPM_BUILD_ROOT%{_bindir}/X
+ln -sf Xorg $RPM_BUILD_ROOT%{_bindir}/X
# setting ghost X in /etc/X11 -- xf86config will fix this ...
ln -sf %{_bindir}/Xorg $RPM_BUILD_ROOT%{_sysconfdir}/X11/X
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/xorg.conf
-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}
-%ifnarch sparc sparc64
-gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
+# help rpm to detect deps
+chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
+
+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.*
-%endif
+gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
+
+install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
+echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
+
+chmod -R u+w $RPM_BUILD_ROOT
%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 -- X11-libs < 1:6.8.2-11.13
+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
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
%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
+
+%triggerpostun xfs -- xfs
+#if [ -s /etc/X11/fs/config.rpmsave ]; then
+# cp -f /etc/X11/fs/config.rpmsave /etc/X11/fs/config
+#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
+/sbin/chkconfig --add xfs
+/etc/rc.d/init.d/xfs start >&2
+
+%triggerpostun Xserver -- XFree86-Xserver
+if [ -s /etc/X11/XF86Config.rpmsave ]; then
+ cp -f /etc/X11/XF86Config.rpmsave /etc/X11/xorg.conf
+ sed -i -e "s/xfree86/xorg/g" /etc/X11/xorg.conf
fi
#--- %files --------------------------
%files
%defattr(644,root,root,755)
-%ifnarch sparc sparc64
%doc %{_docdir}/%{name}-%{version}
%doc %{_libx11dir}/doc
-%endif
%{_appdefsdir}/UXTerm
%{_appdefsdir}/XCalc
%attr(755,root,root) %{_bindir}/xrandr
%attr(755,root,root) %{_bindir}/xrdb
%attr(755,root,root) %{_bindir}/xrefresh
+%attr(755,root,root) %{_bindir}/xrx
%attr(755,root,root) %{_bindir}/xset
%attr(755,root,root) %{_bindir}/xsetmode
%attr(755,root,root) %{_bindir}/xsetpointer
%{_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*
%{_mandir}/man1/gtf.1*
%{_mandir}/man1/iceauth.1*
%{_mandir}/man1/lbxproxy.1*
-#%{_mandir}/man1/libxrx.1*
+%{_mandir}/man1/libxrx.1*
%{_mandir}/man1/lndir.1*
%{_mandir}/man1/luit.1x*
%{_mandir}/man1/makestrs.1*
%{_mandir}/man1/xrandr.1*
%{_mandir}/man1/xrdb.1*
%{_mandir}/man1/xrefresh.1*
+%{_mandir}/man1/xrx.1*
%{_mandir}/man1/xset.1*
%{_mandir}/man1/xsetmode.1*
%{_mandir}/man1/xsetpointer.1*
%{_mandir}/man1/xon.1*
%{_mandir}/man7/*
+# not related to any packaged files
+#%{_mandir}/man1/XDarwin.1*
+#%{_mandir}/man1/dmxtodmx.1*
+#%{_mandir}/man1/dumpkeymap.1*
+#%{_mandir}/man1/ucs2any.1*
+#%{_mandir}/man1/vdltodmx.1*
+#%{_mandir}/man1/xdmxconfig.1*
+
%lang(it) %{_mandir}/it/man1/startx.1*
%lang(it) %{_mandir}/it/man1/xconsole.1*
%lang(it) %{_mandir}/it/man1/xinit.1*
/usr/lib/X11
%dir %{_bindir}
%dir %{_libdir}
+%if "%{_lib}" != "lib"
+%dir %{_prefix}/lib
+%endif
%dir %{_libx11dir}
%{_libx11dir}/rgb.txt
+%files Xprint
+%defattr(644,root,root,755)
+%dir %{_sysconfdir}/X11/xserver/C
+%dir %{_sysconfdir}/X11/xserver/C/print
+%{_sysconfdir}/X11/xserver/C/print/*
+%lang(en) %dir %{_sysconfdir}/X11/xserver/en_US
+%lang(en) %dir %{_sysconfdir}/X11/xserver/en_US/print
+%lang(en) %{_sysconfdir}/X11/xserver/en_US/print/*
+
%files DPS
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/makepsres
%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) %{_libdir}/modules/extensions/libglx.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
+%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.so
%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) %{_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.1x*
-
%files OpenGL-static
%defattr(644,root,root,755)
%{_libdir}/libGL.a
%files Xprt
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xprt
+%{_mandir}/man1/Xprt.1*
%files Xserver
%defattr(644,root,root,755)
-%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/Xorg
+%attr(755,root,root) %{_bindir}/*dmx*
+%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/getconfig*
%attr(755,root,root) %{_sysconfdir}/X11/X
%attr(755,root,root) %{_bindir}/X
%{_mandir}/man1/Xorg.1*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/*dmx*.1*
%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/xorg.conf.5*
%{_mandir}/man5/getconfig.5*
+
%{_libx11dir}/Cards
%{_libx11dir}/Options
%{_libx11dir}/getconfig
-%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/xorg.conf
-%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(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%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
-%attr(755,root,root) %{_libdir}/libI810XvMC.so
+%attr(755,root,root) %{_libdir}/lib*XvMC*.so
%attr(755,root,root) %{_libdir}/libICE.so
%attr(755,root,root) %{_libdir}/libSM.so
%attr(755,root,root) %{_libdir}/libX11.so
%attr(755,root,root) %{_libdir}/libXRes.so
%attr(755,root,root) %{_libdir}/libXTrap.so
+%attr(755,root,root) %{_libdir}/libXau.so
%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXcomposite.so
%attr(755,root,root) %{_libdir}/libXcursor.so
+%attr(755,root,root) %{_libdir}/libXdamage.so
+%attr(755,root,root) %{_libdir}/libXdmcp.so
+%attr(755,root,root) %{_libdir}/libXevie.so
%attr(755,root,root) %{_libdir}/libXext.so
+%attr(755,root,root) %{_libdir}/libXfixes.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}/libXt.so
%attr(755,root,root) %{_libdir}/libXtst.so
%attr(755,root,root) %{_libdir}/libXv.so
-%attr(755,root,root) %{_libdir}/libXvMC.so
%attr(755,root,root) %{_libdir}/libXxf86dga.so
%attr(755,root,root) %{_libdir}/libXxf86misc.so
%attr(755,root,root) %{_libdir}/libXxf86rush.so
%attr(755,root,root) %{_libdir}/libfontenc.so
%attr(755,root,root) %{_libdir}/libxkbfile.so
%attr(755,root,root) %{_libdir}/libxkbui.so
-#%attr(755,root,root) %{_libdir}/libxrx.so
-%{_libdir}/libXau.a
-%{_libdir}/libXdmcp.a
+%attr(755,root,root) %{_libdir}/libxrx*.so
+%{_libdir}/libXprintAppUtil.a
+%{_libdir}/libXprintUtil.a
+%{_libdir}/libdmx.a
%{_libdir}/libfntstubs.a
%{_libdir}/liboldX.a
%{_libdir}/libxf86config.a
%{_includedir}/X11/Xcursor
%{_includedir}/X11/Xft
%{_includedir}/X11/Xmu
+%{_includedir}/X11/XprintAppUtil
+%{_includedir}/X11/XprintUtil
%dir %{_includedir}/X11/extensions
%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
-%{_mandir}/man3/[A-FH-Z]*
+%{_mandir}/man1/bdftopcf.1*
+%{_mandir}/man1/xft-config.1*
+%{_mandir}/man3/[A-FH-Zl]*
+%{_pkgconfigdir}/xcomposite.pc
%{_pkgconfigdir}/xcursor.pc
+%{_pkgconfigdir}/xdamage.pc
+%{_pkgconfigdir}/xevie.pc
+%{_pkgconfigdir}/xfixes.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*
+%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.so
+%{_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
+%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.so
%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.so
+%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.so
+%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.so
+%{_mandir}/man4/cyrix.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
+%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 sparcv9 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.so
%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.so
+%{_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
-%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
+%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.so
+%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.so
+%{_mandir}/man4/i128.4*
%endif
+%files driver-i2c
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/multimedia/bt*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/fi*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/tda*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/msp*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/uda*.so
+
# 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*
+%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.so
+%{_mandir}/man4/i740.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64 %{x8664}
%files driver-i810
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.so
+%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
-%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
-%{_mandir}/man4/i810*
+%endif
+%attr(755,root,root) %{_libdir}/modules/dri/i915_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)
-%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.so
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 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
+%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.so
+%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.so
+%{_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)
-%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.so
%{_mandir}/man4/newport.4*
%endif
%ifarch %{ix86}
%files driver-nsc
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.so
%{_mandir}/man4/nsc.4*
%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.so
+%attr(755,root,root) %{_libdir}/modules/drivers/riva128.so
+%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/theatre*_drv.so
%files driver-r128
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.so
+%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
+%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.so
+%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
+%if %{with r300}
+%attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
+%endif
%endif
-%{_mandir}/man4/radeon*
+%{_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
+%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.so
%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.so
+%{_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
+%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.so
#%%{_mandir}/man4/s3.4*
%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.so
+%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.so
+%{_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}
+%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.so
+%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-sisusb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/sisusb_drv.so
+%{_mandir}/man4/sisusb.4*
+
+%ifarch sparc sparc64 sparcv9
%files driver-sunbw2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
-%{_mandir}/man4/sunbw2*
+%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.so
+%{_mandir}/man4/sunbw2.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg14
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
-%{_mandir}/man4/suncg14*
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.so
+%{_mandir}/man4/suncg14.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg3
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
-%{_mandir}/man4/suncg3*
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.so
+%{_mandir}/man4/suncg3.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suncg6
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
-%{_mandir}/man4/suncg6*
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.so
+%{_mandir}/man4/suncg6.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-sunffb
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.so
+# 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
+%ifarch sparc sparc64 sparcv9
%files driver-sunleo
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
-%{_mandir}/man4/sunleo*
+%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.so
+%{_mandir}/man4/sunleo.4*
%endif
-%ifarch sparc sparc64
+%ifarch sparc sparc64 sparcv9
%files driver-suntcx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
-%{_mandir}/man4/suntcx*
+%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.so
+%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
-%if %{with tdfx}
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 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
+%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.so
+%ifarch %{ix86} ia64 alpha arm
%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
+%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.so
%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.so
+%{_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*
+%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.so
+%{_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
+%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/modules/dri/unichrome_dri.so
+%endif
%{_mandir}/man4/via.4*
%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*
+%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.so
+%{_mandir}/man4/vmware.4*
%endif
%files libs
%defattr(644,root,root,755)
+/etc/ld.so.conf.d/*.conf
%dir %{_sysconfdir}/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
+%dir %{_themesdir}/Metal
+%dir %{_themesdir}/Industrial
%{_libx11dir}/XErrorDB
%{_libx11dir}/XKeysymDB
%dir %{_appdefsdir}
%lang(es) %dir %{_appdefsdir}/es
%lang(fr) %dir %{_appdefsdir}/fr
%lang(hu) %dir %{_appdefsdir}/hu
+%lang(it) %dir %{_appdefsdir}/it
+%lang(ja) %dir %{_appdefsdir}/ja
%lang(ko) %dir %{_appdefsdir}/ko
%lang(nl) %dir %{_appdefsdir}/nl
%lang(pl) %dir %{_appdefsdir}/pl
%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}/lib*XvMC*.so.*.*
%attr(755,root,root) %{_libdir}/libICE.so.*.*
%attr(755,root,root) %{_libdir}/libSM.so.*.*
%attr(755,root,root) %{_libdir}/libX11.so.*.*
%attr(755,root,root) %{_libdir}/libXRes.so.*.*
%attr(755,root,root) %{_libdir}/libXTrap.so.*.*
-%attr(755,root,root) %{_libdir}/libXaw.so.*.*
-%attr(755,root,root) %{_libdir}/libXcursor.*.*.*
+%attr(755,root,root) %{_libdir}/libXau.so.*.*
+%attr(755,root,root) %{_libdir}/libXaw.so.6.*
+%attr(755,root,root) %{_libdir}/libXaw.so.7.*
+%attr(755,root,root) %{_libdir}/libXaw.so.8.*
+%attr(755,root,root) %{_libdir}/libXcomposite.so.*.*
+%attr(755,root,root) %{_libdir}/libXcursor.so.*.*.*
+%attr(755,root,root) %{_libdir}/libXdamage.so.*.*
+%attr(755,root,root) %{_libdir}/libXdmcp.so.*.*
+%attr(755,root,root) %{_libdir}/libXevie.so.*.*
%attr(755,root,root) %{_libdir}/libXext.so.*.*
+%attr(755,root,root) %{_libdir}/libXfixes.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}/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}/libXt.so.*.*
%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%attr(755,root,root) %{_libdir}/libXv.so.*.*
-%attr(755,root,root) %{_libdir}/libXvMC.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86dga.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.*
%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.*
%attr(755,root,root) %{_libdir}/libfontenc.so.*.*
%attr(755,root,root) %{_libdir}/libxkbfile.so.*.*
%attr(755,root,root) %{_libdir}/libxkbui.so.*.*
-#%attr(755,root,root) %{_libdir}/libxrx.so.*.*
+%attr(755,root,root) %{_libdir}/libxrx*.so.*.*
%files modules
%defattr(644,root,root,755)
%dir %{_libdir}/modules
%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/drivers/linux
-%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
-%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
+%attr(755,root,root) %{_libdir}/modules/*.so
+%attr(755,root,root) %{_libdir}/modules/drivers/v4l_drv.so
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
+%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.so
%endif
-%ifarch %{ix86} sparc sparc64 amd64
-%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64
+%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.so
%endif
%dir %{_libdir}/modules/extensions
-%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libdri.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.a
-%attr(755,root,root) %{_libdir}/modules/extensions/librecord.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.a
+%dir %{_libdir}/modules/multimedia
+%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libdri.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.so
+%attr(755,root,root) %{_libdir}/modules/extensions/librecord.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.so
%attr(755,root,root) %{_libdir}/modules/fonts
%attr(755,root,root) %{_libdir}/modules/input
%attr(755,root,root) %{_libdir}/modules/linux
#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/aiptek.4*
-%{_mandir}/man4/citron*
+%{_mandir}/man4/citron.4*
%{_mandir}/man4/dmc.4*
-%{_mandir}/man4/dynapro*
+%{_mandir}/man4/dynapro.4*
+%{_mandir}/man4/elographics.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard*
-%{_mandir}/man4/microtouch*
+%{_mandir}/man4/keyboard.4*
+%{_mandir}/man4/microtouch.4*
%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/mutouch.4*
%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
-%ifnarch amd64
-%{_mandir}/man4/v4l*
+%{_mandir}/man4/v4l.4*
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 alpha ppc arm
+%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
-%{_mandir}/man4/vga*
+%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9
+%{_mandir}/man4/vesa.4*
%endif
-%ifarch %{ix86} sparc sparc64 amd64
-%{_mandir}/man4/vesa*
-%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)
%files static
%defattr(644,root,root,755)
%{_libdir}/libFS.a
-%{_libdir}/libI810XvMC.a
+%{_libdir}/lib*XvMC*.a
%{_libdir}/libICE.a
%{_libdir}/libSM.a
%{_libdir}/libX11.a
%{_libdir}/libXRes.a
%{_libdir}/libXTrap.a
+%{_libdir}/libXau.a
%{_libdir}/libXaw.a
+%{_libdir}/libXcomposite.a
%{_libdir}/libXcursor.a
+%{_libdir}/libXdamage.a
+%{_libdir}/libXdmcp.a
+%{_libdir}/libXevie.a
%{_libdir}/libXext.a
+%{_libdir}/libXfixes.a
%{_libdir}/libXfont.a
-%{_libdir}/libXfontcache.a
%{_libdir}/libXft.a
%{_libdir}/libXi.a
%{_libdir}/libXinerama.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
%{_libdir}/libXxf86dga.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%attr(755,root,root) %{_bindir}/beforelight
%attr(755,root,root) %{_bindir}/ico
%attr(755,root,root) %{_bindir}/listres
+%attr(755,root,root) %{_bindir}/oclock
+%attr(755,root,root) %{_bindir}/rman
%attr(755,root,root) %{_bindir}/showfont
+%attr(755,root,root) %{_bindir}/texteroids
%attr(755,root,root) %{_bindir}/viewres
%attr(755,root,root) %{_bindir}/x11perf
%attr(755,root,root) %{_bindir}/x11perfcomp
%attr(755,root,root) %{_bindir}/xclipboard
%attr(755,root,root) %{_bindir}/xclock
%attr(755,root,root) %{_bindir}/xditview
+%attr(755,root,root) %{_bindir}/xdbedizzy
+%attr(755,root,root) %{_bindir}/xdpr
+%attr(755,root,root) %{_bindir}/xdriinfo
%attr(755,root,root) %{_bindir}/xedit
%attr(755,root,root) %{_bindir}/xev
%attr(755,root,root) %{_bindir}/xeyes
%attr(755,root,root) %{_bindir}/xfd
%attr(755,root,root) %{_bindir}/xfontsel
%attr(755,root,root) %{_bindir}/xgc
+%attr(755,root,root) %{_bindir}/xkill
%attr(755,root,root) %{_bindir}/xload
+%attr(755,root,root) %{_bindir}/xlogo
%attr(755,root,root) %{_bindir}/xmag
%attr(755,root,root) %{_bindir}/xman
%attr(755,root,root) %{_bindir}/xmessage
%attr(755,root,root) %{_bindir}/xmh
-%attr(755,root,root) %{_bindir}/xwininfo
-%attr(755,root,root) %{_bindir}/oclock
-%attr(755,root,root) %{_bindir}/xlogo
-%attr(755,root,root) %{_bindir}/xkill
-%attr(755,root,root) %{_bindir}/rman
+%attr(755,root,root) %{_bindir}/xmore
+%attr(755,root,root) %{_bindir}/xphelloworld
+%attr(755,root,root) %{_bindir}/xplsprinters
+%attr(755,root,root) %{_bindir}/xpr
+%attr(755,root,root) %{_bindir}/xprehashprinterlist
+%attr(755,root,root) %{_bindir}/xpsimplehelloworld
+%attr(755,root,root) %{_bindir}/xpxthelloworld
%attr(755,root,root) %{_bindir}/xtrap*
-%attr(755,root,root) %{_bindir}/texteroids
+%attr(755,root,root) %{_bindir}/xwininfo
%{_libx11dir}/xedit
%{_libx11dir}/xman.help
%{_mandir}/man1/beforelight.1*
%{_mandir}/man1/ico.1*
%{_mandir}/man1/listres.1*
+%{_mandir}/man1/oclock.1*
+%{_mandir}/man1/rman.1*
%{_mandir}/man1/showfont.1*
+%{_mandir}/man1/texteroids.1*
%{_mandir}/man1/viewres.1*
%{_mandir}/man1/x11perf.1*
%{_mandir}/man1/x11perfcomp.1*
%{_mandir}/man1/xclipboard.1*
%{_mandir}/man1/xclock.1*
%{_mandir}/man1/xditview.1*
+%{_mandir}/man1/xdbedizzy.1*
+%{_mandir}/man1/xdpr.1*
+%{_mandir}/man1/xdriinfo.1*
+%{_mandir}/man1/xmore.1*
%{_mandir}/man1/xedit.1*
%{_mandir}/man1/xev.1*
%{_mandir}/man1/xeyes.1*
%{_mandir}/man1/xfd.1*
%{_mandir}/man1/xfontsel.1*
%{_mandir}/man1/xgc.1*
+%{_mandir}/man1/xkill.1*
%{_mandir}/man1/xload.1*
+%{_mandir}/man1/xlogo.1*
%{_mandir}/man1/xmag.1*
%{_mandir}/man1/xman.1*
%{_mandir}/man1/xmessage.1*
%{_mandir}/man1/xmh.1*
+%{_mandir}/man1/xphelloworld.1*
+%{_mandir}/man1/xplsprinters.1*
+%{_mandir}/man1/xpr.1*
+%{_mandir}/man1/xprehashprinterlist.1*
+%{_mandir}/man1/xpsimplehelloworld.1*
+%{_mandir}/man1/xpxthelloworld.1*
+%{_mandir}/man1/xtrap*
%{_mandir}/man1/xwininfo.1*
-%{_mandir}/man1/xkill.1*
-%{_mandir}/man1/xlogo.1*
-%{_mandir}/man1/oclock.1*
-%{_mandir}/man1/rman.1*
-%{_mandir}/man1/xtr*
-%{_mandir}/man1/texteroids.1*
%lang(it) %{_mandir}/it/man1/xload.1*
%{_appdefsdir}/Editres-color
%{_appdefsdir}/Viewres
%{_appdefsdir}/XConsole
+%{_appdefsdir}/XFontSel
+%{_appdefsdir}/XMore
+%{_appdefsdir}/Xditview
+%{_appdefsdir}/Xditview-chrtr
%{_appdefsdir}/Xedit
%{_appdefsdir}/Xedit-color
%{_appdefsdir}/Xfd
%{_appdefsdir}/Xmessage
%{_appdefsdir}/Xmessage-color
%{_appdefsdir}/Xmh
-%{_appdefsdir}/XFontSel
-%{_appdefsdir}/Xditview
-%{_appdefsdir}/Xditview-chrtr
%{_desktopdir}/oclock.desktop
%{_desktopdir}/xcalc.desktop
%files xauth
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xauth
+%attr(755,root,root) %{_bindir}/xauth*
%{_mandir}/man1/xauth.1*
%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
%{_mandir}/man1/xdm.1*
%dir %{_sysconfdir}/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/xdm/xdm-config
+%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