X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=493be598f4d462c3f1675cc63fefc3044d1a79ca;hb=refs%2Fheads%2FRA-branch-security;hp=edbd6afb50625c792c4b966c55712ec30fb14232;hpb=29329befe31e3794025231bc911ec493c4ce306b;p=packages%2FXFree86.git diff --git a/XFree86.spec b/XFree86.spec index edbd6af..493be59 100644 --- a/XFree86.spec +++ b/XFree86.spec @@ -1,38 +1,59 @@ + +# SECURITY: CAN-2004-0083 CAN-2004-0084 CAN-2004-0106 CAN-2004-0419 + +# _without_tdfx disables tdfx build + +%define _sver %(echo %{version} | tr -d .) + Summary: XFree86 Window System servers and basic programs Summary(de): Xfree86 Window-System-Server und grundlegende Programme Summary(es): Programas básicos y servidores para el sistema de ventanas XFree86 Summary(fr): Serveurs du système XFree86 et programmes de base +Summary(ja): XFree86 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à +Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼­µé Summary(pl): XFree86 Window System wraz z podstawowymi programami Summary(tr): XFree86 Pencereleme Sistemi sunucularý ve temel programlar Summary(pt_BR): Programas básicos e servidores para o sistema de janelas XFree86 +Summary(ru): âÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÑ ÄÌÑ ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ ÐÏÄ X +Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X +Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò Name: XFree86 -Version: 4.1.0 -Release: 15 +Version: 4.2.1 +Release: 13 License: MIT Group: X11/XFree86 -Group(de): X11/XFree86 -Group(es): X11/XFree86 -Group(fr): X11/XFree86 -Group(pl): X11/XFree86 -Group(pt_BR): X11/XFree86 -Group(tr): X11/XFree86 -Source0: ftp://ftp.xfree86.org/pub/XFree86/4.1.0/source/X410src-1.tgz -Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2 -Source2: xdm.pamd -Source3: xserver.pamd -Source4: xdm.init -Source5: xfs.init -Source6: xfs.config -Source7: XTerm.ad-pl -Source8: xdm.sysconfig -Source9: xfs.sysconfig -Source10: twm.desktop -Source11: xclipboard.desktop -Source12: xconsole.desktop -Source13: xterm.desktop -Source14: xlogo64.png -Source15: http://papico.crl.go.jp/pub/linux/linuxppc/users/ajoshi/s3/s3-0.3.52.tgz -Source16: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2 +Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz +# Source0-md5: ad43a8e9e39703322005cd6f7145b77f +Source1: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2 +# Source1-md5: 0a15b1c374256b5cad7961807baa3896 +Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2 +# Source2-md5: 8d43c01d364576c195a5294279f92566 +Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2 +# Source3-md5: a184106bb83cb27c6963944d9243ac3f +Source4: xdm.pamd +Source5: xserver.pamd +Source6: xdm.init +Source7: xfs.init +Source8: xfs.config +Source9: XTerm.ad-pl +Source10: xdm.sysconfig +Source11: xfs.sysconfig +Source20: twm.desktop +Source21: xeyes.desktop +Source22: xedit.desktop +Source23: xterm.desktop +Source24: xclipboard.desktop +Source25: xclock.desktop +Source26: oclock.desktop +Source27: xconsole.desktop +Source30: xlogo64.png +Source31: xeyes.png +Source32: xedit.png +Source33: xterm.png +Source34: xclipboard.png +Source35: xclock.png +Source36: oclock.png +Source37: xconsole.png Patch0: %{name}-PLD.patch Patch1: %{name}-HasZlib.patch Patch2: %{name}-DisableDebug.patch @@ -54,25 +75,54 @@ Patch17: %{name}-imake-kernel-version.patch Patch18: %{name}-no-kernel-modules.patch Patch19: %{name}-parallelmake.patch Patch20: %{name}-pic.patch -Patch21: %{name}-defmodes-1400.patch -Patch22: %{name}-r128-busmstr2.patch -Patch23: %{name}-neomagic_swcursor.patch -Patch24: %{name}-mga-busmstr.patch -Patch25: %{name}-agpgart-load.patch -Patch26: %{name}-mkfontdir-chmod_644.patch -Patch27: %{name}-HasFreetype2.patch -Patch28: %{name}-libXfont-put-eof.patch -Patch29: %{name}-config-s3.patch -Patch30: %{name}-stolen_from_HEAD.patch -Patch31: %{name}-sparc_pci_domains.patch -Patch32: %{name}-s3virge_mx_console_corruption_fix.patch -Patch33: %{name}-cirrus_driver_fix.patch -Patch34: %{name}-dri_directory_mode_fix.patch -Patch35: %{name}-alpha_GLX_align_fix.patch -Patch36: %{name}-manpage_link_fixes.patch -Patch37: %{name}-XftConfig_in_correct_place.patch -Patch38: %{name}-i740.patch -Patch39: %{name}-compaq-alpha-megapatch.patch +Patch21: %{name}-r128-busmstr2.patch +Patch22: %{name}-neomagic_swcursor.patch +Patch23: %{name}-mga-busmstr.patch +Patch24: %{name}-agpgart-load.patch +Patch25: %{name}-mkfontdir-chmod_644.patch +Patch26: %{name}-HasFreetype2.patch +Patch27: %{name}-config-s3.patch +Patch28: %{name}-sparc_pci_domains.patch +Patch29: %{name}-XTerm.ad.patch +Patch30: %{name}-dri_directory_mode_fix.patch +Patch31: %{name}-alpha_GLX_align_fix.patch +Patch32: %{name}-XftConfig_in_correct_place.patch +Patch33: %{name}-PEX+XIE.patch +Patch34: %{name}-xman-manpaths.patch +Patch35: %{name}-ppc_drivers.patch +Patch36: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz +Patch37: %{name}-clearrts.patch +Patch38: %{name}-mga020414.patch +Patch39: %{name}-trident-9397.patch +Patch40: %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2 +Patch41: %{name}-nv020414.patch +Patch42: %{name}-fix-07-s3trio64v2gx+netfinity.patch +Patch43: %{name}-prosavage.patch +Patch44: %{name}-xtt-null-pointer.patch +Patch45: %{name}-i740-driver-update-cvs-20020617.patch +Patch46: %{name}-neomagic-Xv-support.patch +Patch47: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch +Patch48: %{name}-tdfx-should-be-2048-not-2046.patch +Patch49: %{name}-tdfx-interlace.patch +Patch50: %{name}-tdfx-fix-compiler-warnings.patch +Patch51: %{name}-tdfx-fix-vtswitch-font-corruption.patch +Patch52: %{name}-sis-option-swcursor.patch +Patch53: %{name}-sis-unresolved-symbols.patch +Patch54: %{name}-sis-maxxfbmem-fixup.patch +Patch55: %{name}-Radeon9000.patch +Patch56: %{name}-Xfont-Type1-large-DoS.patch +# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore +# loading failure with "debug_xform.o: no symbols" +Patch57: %{name}-GLcore-strip-a-workaround.patch +# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch +Patch58: %{name}-4.2.1-mit-shm-security.patch +Patch59: %{name}-disable_glide.patch +Patch60: %{name}-xterm-can-2003-0063.patch +Patch61: %{name}-xlclocale-overflow.patch +Patch62: %{name}-xterm-DECUDK-security-fix.patch +Patch63: %{name}-font-overflows.patch +Patch64: %{name}-bison.patch +URL: http://www.xfree86.org/ BuildRequires: bison BuildRequires: flex BuildRequires: freetype-devel >= 2.0.0 @@ -83,17 +133,17 @@ BuildRequires: perl BuildRequires: tcl-devel BuildRequires: utempter-devel BuildRequires: zlib-devel +BuildRequires: libstdc++-devel %ifarch %{ix86} alpha -BuildRequires: Glide3-DRI-devel +%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel} %endif # Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c %ifarch %{ix86} -BuildRequires: Glide2x_SDK +%{!?_without_tdfx:BuildRequires: Glide2x_SDK} %endif -Requires: XFree86-fonts-ISO8859-1 = %{version} -Requires: XFree86-libs = %{version} Requires: xauth -ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch +Requires: %{name}-libs = %{version} +ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: xpm-progs Obsoletes: xterm @@ -107,10 +157,8 @@ Obsoletes: X11R6.1 %define _wmpropsdir %{_datadir}/wm-properties # avoid Mesa dependency in XFree86-OpenGL-libs -%define _noautoreqdep libGL.so.1 libGLU.so.1 - # Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI -%define _noautoreqdep libglide3.so.3 +%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3 %description If you want to install the X Window System (TM) on your machine, @@ -188,12 +236,64 @@ Este pacote cont uma estação de trabalho X. Ele não fornece um servidor X que acessa seu hardware de vídeo -- estes são disponibilizados em outro pacote. +%description -l ru +X Window System ÐÒÅÄÏÓÔÁ×ÌÑÅÔ ÂÁÚÕ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÇÒÁÆÉÞÅÓËÉÈ +ÉÎÔÅÒÆÅÊÓÏ× ÐÏÌØÚÏ×ÁÔÅÌÑ. ðÏÐÒÏÓÔÕ ÇÏ×ÏÒÑ, X ÒÉÓÕÅÔ ÜÌÅÍÅÎÔÙ GUI ÎÁ +ÜËÒÁÎÅ ÐÏÌØÚÏ×ÁÔÅÌÑ É ÓÔÏÉÔ ÍÅÔÏÄÙ ÄÌÑ ÐÅÒÅÄÁÞÉ ÄÅÊÓÔ×ÉÊ ÐÏÌØÚÏ×ÁÔÅÌÑ +ÐÒÉËÌÁÄÎÙÍ ÐÒÏÇÒÁÍÍÁÍ. X ÔÁËÖÅ ÐÏÄÄÅÒÖÉ×ÁÅÔ ÒÁÓÐÒÅÄÅÌÅÎÉÅ ÐÒÉÌÏÖÅÎÉÊ - +ÚÁÐÕÓË ÐÒÏÇÒÁÍÍ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ Ó ××ÏÄÏÍ/×Ù×ÏÄÏÍ ÎÁ +ÐÏÌØÚÏ×ÁÔÅÌØÓËÕÀ ÍÁÛÉÎÕ. X - ÜÔÏ ÍÏÝÎÁÑ ÓÒÅÄÁ, ÐÏÄÄÅÒÖÉ×ÁÀÝÁÑ +ÍÎÏÖÅÓÔ×Ï ÐÒÉÌÏÖÅÎÉÊ, ÔÁËÉÈ ËÁË ÉÇÒÙ, ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÒÏÇÒÁÍÍÉÓÔÁ, +ÇÒÁÆÉÞÅÓËÉÅ ÐÒÏÇÒÁÍÍÙ, ÔÅËÓÔÏ×ÙÅ ÒÅÄÁËÔÏÒÙ É Ô.Ð. XFree86 - ÜÔÏ ×ÅÒÓÉÑ +X, ÒÁÂÏÔÁÀÝÁÑ ÎÁ Linux É ÄÒÕÇÉÈ ÓÉÓÔÅÍÁÈ. + +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÂÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÀ ÄÌÑ +ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ X. + +äÏÐÏÌÎÉÔÅÌØÎÏ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔÙ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ +xfs É ÂÉÂÌÉÏÔÅËÉ XFree86-libs. ÷ÏÚÍÏÖÎÏ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÖÅ ÏÄÉÎ +ÉÌÉ ÂÏÌÅÅ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XFree86. + +îÕ É, ÎÁËÏÎÅÃ, ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÉÌÏÖÅÎÉÑ, +ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, ×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ +XFree86-devel. + +%description -l uk +X Window System ÎÁÄÁ¤ ÂÁÚÕ ÄÌÑ ÒÏÚÒÏÂËÉ ÇÒÁƦÞÎÉÈ ¦ÎÔÅÒÆÅÊÓ¦× +ËÏÒÉÓÔÕ×ÁÞÁ. ðÒÏÓÔ¦ÛÅ ËÁÖÕÞÉ, X ÍÁÌÀ¤ ÅÌÅÍÅÎÔÉ GUI ÎÁ ÅËÒÁΦ +ËÏÒÉÓÔÕ×ÁÞÁ ÔÁ ÂÕÄÕ¤ ÍÅÔÏÄÉ ÄÌÑ ÐÅÒÅÄÁÞ¦ Ä¦Ê ËÏÒÉÓÔÕ×ÁÞÁ ÐÒÉËÌÁÄÎÉÍ +ÐÒÏÇÒÁÍÁÍ. X ÔÁËÏÖ Ð¦ÄÔÒÉÍÕ¤ ÒÏÚÐÏÄ¦Ì ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ - ÚÁÐÕÓË +ÐÒÏÇÒÁÍ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦ Ú ××ÏÄÏÍ/×É×ÏÄÏÍ ÎÁ ÍÁÛÉÎÕ +ËÏÒÉÓÔÕ×ÁÞÁ. X - ÃÅ ÐÏÔÕÖÎÅ ÓÅÒÅÄÏ×ÉÝÅ, ÑËŠЦÄÔÒÉÍÕ¤ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ +Ò¦ÚÎÉÈ ÐÒÏÇÒÁÍ, ÔÁËÉÈ ÑË ¦ÇÒÉ, ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ ÐÒÏÇÒÁͦÓÔÁ, ÇÒÁƦÞΦ +ÐÒÏÇÒÁÍÉ, ÔÅËÓÔÏצ ÒÅÄÁËÔÏÒÉ ¦ Ô.¦. XFree86 - ÃÅ ×ÅÒÓ¦Ñ X, ÑËÁ ÐÒÁÃÀ¤ +ÎÁ Linux ÔÁ ¦ÎÛÉÈ ÓÉÓÔÅÍÁÈ. + +ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÂÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ ÄÌÑ ÒÏÂÏÞϧ +ÓÔÁÎæ§ X. + +äÏÄÁÔËÏ×Ï ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔÉ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ xfs ÔÁ +¦Â̦ÏÔÅËÉ XFree86-libs. íÏÖÌÉ×Ï ÔÁËÏÖ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÏÄÉÎ ÁÂÏ +ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XFree86. + +îÕ ¦, ÎÁÒÅÛÔ¦, ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÉËÌÁÄΦ ÐÒÏÇÒÁÍÉ, ÝÏ +ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ ÔÁËÏÖ ÔÒÅÂÁ ÂÕÄÅ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel. + +%package common +Summary: XFree86 files required both on server and client side +Summary(pl): Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta +Group: X11/XFree86 + +%description common +XFree86 files required both on server and client side. + +%description common -l pl +Pliki XFree86 wymagane zarówno po stronie serwera jak i klienta. + %package DPS Summary: Display PostScript Summary(pl): Display PostScript Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Provides: DPS Obsoletes: dgs @@ -209,8 +309,6 @@ wy Summary: Display PostScript Summary(pl): Display PostScript Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-DPS = %{version} Obsoletes: dgs-devel @@ -224,8 +322,6 @@ Pliki nag Summary: Display PostScript Summary(pl): Display PostScript Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-DPS-devel = %{version} Obsoletes: dgs-static @@ -235,19 +331,87 @@ X-Window Display PostScript static libraries. %description DPS-static -l pl Statyczne biblioteki X-Window Display PostScript. +%package PEX +Summary: PEX extension library +Summary(pl): Biblioteka rozszerzenia PEX +Group: X11/XFree86 +Requires: %{name}-libs = %{version} + +%description PEX +PEX extension library. Since XFree86 4.2.0 it's no longer included by +default. + +%description PEX -l pl +Biblioteka rozszerzenia PEX. Od wersji XFree86 4.2.0 nie jest ju¿ +do³±czane domy¶lnie. + +%package PEX-devel +Summary: PEX extension headers +Summary(pl): Pliki nag³ówkowe rozszerzenia PEX +Group: X11/XFree86 +Requires: %{name}-PEX = %{version} + +%description PEX-devel +PEX extension headers. + +%description PEX-devel -l pl +Pliki nag³ówkowe rozszerzenia PEX. + +%package PEX-static +Summary: PEX extension static library +Summary(pl): Statyczna biblioteka rozszerzenia PEX +Group: X11/XFree86 +Requires: %{name}-PEX-devel = %{version} + +%description PEX-static +PEX extension static library. + +%description PEX-static -l pl +Statyczna biblioteka rozszerzenia PEX. + +%package XIE +Summary: XIE extension library +Summary(pl): Biblioteka rozszerzenia XIE +Group: X11/XFree86 +Requires: %{name}-libs = %{version} + +%description XIE +XIE (X Image Extension) extension library. Since XFree86 4.2.0 it's no +longer included by default. + +%description XIE -l pl +Biblioteka rozszerzenia XIE (X Image Extension). Od wersji XFree86 +4.2.0 nie jest ju¿ do³±czane domy¶lnie + +%package XIE-devel +Summary: XIE extension headers +Summary(pl): Pliki nag³ówkowe rozszerzenia XIE +Group: X11/XFree86 +Requires: %{name}-XIE = %{version} + +%description XIE-devel +XIE extension headers. + +%description XIE-devel -l pl +Pliki nag³ówkowe rozszerzenia XIE. + +%package XIE-static +Summary: XIE extension static library +Summary(pl): Statyczna biblioteka rozszerzenia XIE +Group: X11/XFree86 +Requires: %{name}-XIE-devel = %{version} + +%description XIE-static +XIE extension static library. + +%description XIE-static -l pl +Statyczna biblioteka rozszerzenia XIE. + %package OpenGL-core Summary: OpenGL support for X11R6 Summary(pl): Wsparcie OpenGL dla systemu X11R6 Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-libs = %{version} -Obsoletes: Mesa %description OpenGL-core OpenGL support for X11R6 system. @@ -259,17 +423,12 @@ Wsparcie OpenGL dla systemu X11R6. Summary: OpenGL for X11R6 development Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-OpenGL-libs = %{version} Requires: %{name}-devel Provides: OpenGL-devel -Obsoletes: Mesa-devel glxMesa-devel +Obsoletes: Mesa-devel +Obsoletes: glxMesa-devel +Obsoletes: XFree86-OpenGL-doc %description OpenGL-devel Headers and man pages for OpenGL for X11R6. @@ -281,13 +440,6 @@ Pliki nag Summary: OpenGL libraries for X11R6 Summary(pl): Biblioteki OpenGL dla systemu X11R6 Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-libs = %{version} Requires: %{name}-OpenGL-core Provides: OpenGL @@ -304,13 +456,6 @@ Biblioteki OpenGL dla systemu X11R6. Summary: X11R6 static libraries with OpenGL Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-OpenGL-devel = %{version} Provides: OpenGL-static Obsoletes: Mesa-static @@ -324,11 +469,12 @@ Biblioteki statyczne zawieraj %package Xnest Summary: XFree86 Xnest server Summary(pl): Serwer XFree86 Xnest +Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86 +Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86 Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Requires: %{name}-modules = %{version}-%{release} -Requires: %{name}-fonts >= 4.0.2 +Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt +Requires: XFree86-fonts-base %description Xnest Xnest is an X Window System server which runs in an X window. Xnest is @@ -344,14 +490,32 @@ Xnest jest X serwerem uruchamianym w okienku innego X serwera. Xnest zachowuje siê jak X klient w stosunku do prawdziwego X serwera, a jak X serwer dla w³asnych klientów. +%description Xnest -l ru +Xnest - ÜÔÏ ÓÅÒ×ÅÒ X Window System, ËÏÔÏÒÙÊ ÒÁÂÏÔÁÅÔ × ÏËÎÅ X. îÁ +ÓÁÍÏÍ ÄÅÌÅ ÜÔÏ ËÌÉÅÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ËÏÔÏÒÙÊ ÕÐÒÁ×ÌÑÅÔ ÏËÎÁÍÉ É +ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Xnest × ÔÏ ×ÒÅÍÑ, ËÁË Xnest ÕÐÒÁ×ÌÑÅÔ +ÏËÎÁÍÉ É ÇÒÁÆÉÞÅÓËÉÍÉ ÚÁÐÒÏÓÁÍÉ ÄÌÑ Ó×ÏÉÈ ÓÏÂÓÔ×ÅÎÎÙÈ ËÌÉÅÎÔÏ×. + +÷ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ Xnest ÅÓÌÉ ×ÁÍ ÎÕÖÅÎ X-ÓÅÒ×ÅÒ, ËÏÔÏÒÙÊ ÒÁÂÏÔÁÅÔ +ËÁË ËÌÉÅÎÔ ×ÁÛÅÇÏ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ (ÓËÏÒÅÅ ×ÓÅÇÏ, × ÔÅÓÔÏ×ÙÈ +ÃÅÌÑÈ). + +%description Xnest -l uk +Xnest - ÃÅ ÓÅÒ×ÅÒ X Window System, ÑËÉÊ ÐÒÁÃÀ¤ Õ ×¦ËΦ X. æÁËÔÉÞÎÏ ÃÅ +Ë̦¤ÎÔ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ, ÑËÉÊ ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ +ÄÌÑ Xnest × ÔÏÊ ÞÁÓ, ÑË Xnest ËÅÒÕ¤ צËÎÁÍÉ ÔÁ ÇÒÁƦÞÎÉÍÉ ÚÁÐÉÔÁÍÉ ÄÌÑ +Ó×Ï§È ×ÌÁÓÎÉÈ Ë̦¤ÎÔ¦×. + +÷ÁÍ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ Xnest ÑËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÅÎ X-ÓÅÒ×ÅÒ, ÑËÉÊ ÐÒÁÃÀ¤ ÑË +Ë̦¤ÎÔ ×ÁÛÏÇÏ ÒÅÁÌØÎÏÇÏ X-ÓÅÒ×ÅÒÁ (ÓËÏÒÛÅ ×ÓØÏÇÏ, Õ ÔÅÓÔÏ×ÉÈ Ã¦ÌÑÈ). + %package Xprt Summary: X print server Summary(pl): X serwer z rozszerzeniem Xprint Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Requires: %{name}-modules = %{version}-%{release} -Requires: %{name}-fonts >= 4.0.2 +Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt +Requires: XFree86-fonts-base %description Xprt Xprt provides an X server with the print extension and special DDX @@ -367,26 +531,17 @@ Summary(fr): Serveur XFree86 Summary(pl): Serwer XFree86 Summary(tr): XFree86 sunucusu Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Requires: pam Requires: %{name}-modules = %{version}-%{release} -Requires: /usr/X11R6/lib/X11/rgb.txt -Obsoletes: %{name}-VGA16 %{name}-SVGA %{name}-Mono -Obsoletes: XFree86-S3 XFree86-S3V XFree86-I128 -Obsoletes: XFree86-Mach8 XFree86-Mach32 XFree86-Mach64 -Obsoletes: XFree86-8514 XFree86-AGX XFree86-3DLabs -Obsoletes: XFree86-P9000 XFree86-W32 -Obsoletes: XFree86-ATI XFree86-Alliance XFree86-ChipsTechnologies -Obsoletes: XFree86-Cirrus XFree86-Cyrix XFree86-FBDev -Obsoletes: XFree86-i740 XFree86-i810 XFree86-mga -Obsoletes: XFree86-NeoMagic XFree86-NVidia -Obsoletes: XFree86-Rage128 XFree86-Rendition -Obsoletes: XFree86-S3V XFree86-SiS XFree86-3dfx -Obsoletes: XFree86-Trident XFree86-Tseng XFree86-VGA16 -Obsoletes: XFree86-TGA XFree86-FBDev -Obsoletes: XFree86-Sun XFree86-Sun24 XFree86-SunMono -Obsoletes: XFree86-XF86Setup, Xconfigurator +Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt +Requires: XFree86-fonts-base +Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono +# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx +Obsoletes: XFree86-Sun XFree86-Sun24 +# still not supported in 4.2.0: +#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000 +# (and many drivers from XF86_SVGA server... and some from others) +Obsoletes: XFree86-XF86Setup Xconfigurator %description Xserver Generally used X server which uses display hardware. It requires @@ -430,11 +585,12 @@ sunucuyu deneyin. %package Xvfb Summary: XFree86 Xvfb server Summary(pl): Serwer XFree86 Xvfb +Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ +Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ Group: X11/XFree86/Servers -Group(de): X11/XFree86/Server -Group(pl): X11/XFree86/Serwery Requires: %{name}-modules = %{version}-%{release} -Requires: %{name}-fonts >= 4.0.2 +Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt +Requires: XFree86-fonts-base %description Xvfb Xvfb (X Virtual Frame Buffer) is an X Window System server that is @@ -462,21 +618,53 @@ klient do uruchomienia aplikacji, które w rzeczywisto¶ci nie wymagaj± X serwera, ale odmawiaj± uruchomienia bez niego. +%description Xvfb -l ru +Xvfb (X Virtual Frame Buffer) - ÜÔÏ X-ÓÅÒ×ÅÒ, ËÏÔÏÒÙÊ ÓÐÏÓÏÂÅÎ +ÒÁÂÏÔÁÔØ ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ ÄÉÓÐÌÅÊÎÏÊ ÁÐÐÁÒÁÔÕÒÙ É ÆÉÚÉÞÅÓËÉÈ ÕÓÔÒÏÊÓÔ× +××ÏÄÁ. Xvfb ÜÍÕÌÉÒÕÅÔ ÐÒÏÓÔÅÊÛÉÊ ÆÒÅÊÍÂÕÆÅÒ ÉÓÐÏÌØÚÕÑ ×ÉÒÔÕÁÌØÎÕÀ +ÐÁÍÑÔØ. Xvfb ÎÅ ÏÔËÒÙ×ÁÅÔ ÎÉËÁËÉÈ ÕÓÔÒÏÊÓÔ×, ×ÅÄÑ ÓÅÂÑ ËÁË ÎÏÒÍÁÌØÎÙÊ +X-ÓÅÒ×ÅÒ ×Ï ×ÓÅÍ ÏÓÔÁÌØÎÏÍ. ïÂÙÞÎÏ ÏÎ ÉÓÐÏÌØÚÕÅÔÓÑ ÄÌÑ ÐÒÏ×ÅÒËÉ +ÓÅÒ×ÅÒÏ×. éÓÐÏÌØÚÕÑ Xvfb, ÍÏÖÎÏ ÔÅÓÔÉÒÏ×ÁÔØ ËÏÄ mfb ÉÌÉ cfb ÄÌÑ ÌÀÂÏÊ +ÇÌÕÂÉÎÙ Ã×ÅÔÁ ÂÅÚ ÉÓÐÏÌØÚÏ×ÁÎÉÑ ÒÅÁÌØÎÏÊ ÁÐÐÁÒÁÔÕÒÙ, ÐÏÄÄÅÒÖÉ×ÁÀÝÅÊ +ÔÁËÕÀ ÇÌÕÂÉÎÕ. Xvfb ÔÁËÖÅ ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÄÌÑ ÐÒÏ×ÅÒËÉ X-ËÌÉÅÎÔÏ× Ó +ÎÅÏÂÙÞÎÙÍÉ ÇÌÕÂÉÎÁÍÉ Ã×ÅÔÁ É ËÏÎÆÉÇÕÒÁÃÉÑÍÉ ÜËÒÁÎÁ, ÐÒÏÉÚ×ÏÄÉÔØ +ÐÁËÅÔÎÕÀ ÏÂÒÁÂÏÔËÕ Ó Xvfb × ËÁÞÅÓÔ×Å ÆÏÎÏ×ÏÇÏ ÒÅÎÄÅÒÅÒÁ, ÐÒÏ×ÏÄÉÔØ +ÎÁÇÒÕÚÏÞÎÙÅ ÔÅÓÔÙ, ÄÌÑ ÐÏÍÏÝÉ × ÐÏÒÔÉÒÏ×ÁÎÉÉ X-ÓÅÒ×ÅÒÁ ÎÁ ÎÏ×ÕÀ +ÐÌÁÔÆÏÒÍÕ É ÄÌÑ ÈÉÔÒÏÕÍÎÏÇÏ ÚÁÐÕÓËÁ ÐÒÉÌÏÖÅÎÉÊ, ËÏÔÏÒÙÍ ÒÅÁÌØÎÏ ÎÅ +ÎÕÖÅÎ X-ÓÅÒ×ÅÒ, ÎÏ ËÏÔÏÒÙÅ ÎÁÓÔÁÉ×ÁÀÔ ÎÁ ÔÏÍ, ÞÔÏ ÏÎ ÂÙÌ ÄÏÓÔÕÐÅÎ. + +åÓÌÉ ×ÁÍ ÎÁÄÏ ÔÅÓÔÉÒÏ×ÁÔØ ×ÁÛÉ X-ÓÅÒ×ÅÒÁ ÉÌÉ X-ËÌÉÅÎÔÙ, ×Ù ÍÏÖÅÔÅ +ÕÓÔÁÎÏ×ÉÔØ ÄÌÑ ÜÔÏÊ ÃÅÌÉ Xvfb. + +%description Xvfb -l uk +Xvfb (X Virtual Frame Buffer) - ÃÅ X-ÓÅÒ×ÅÒ, ÚÄÁÔÎÉÊ ÐÒÁÃÀ×ÁÔÉ ÎÁ +ÍÁÛÉÎÁÈ ÂÅÚ ÄÉÓÐÌÅÊÎϧ ÁÐÁÒÁÔÕÒÉ ÔÁ צÚÉÞÎÉÈ ÐÒÉÓÔÒÏ§× ××ÏÄÕ. Xvfb +ÅÍÕÌÀ¤ ÎÁÊÐÒÏÓÔ¦ÛÉÊ ÆÒÅÊÍÂÕÆÅÒ ×ÉËÏÒÉÓÔÏ×ÕÀÞÉ ×¦ÒÔÕÁÌØÎÕ ÐÁÍ'ÑÔØ. Xvfb +ΊצÄËÒÉ×Á¤ ΦÑËÉÈ ÐÒÉÓÔÒϧ×, ×ÅÄÕÞÉ ÓÅÂÅ ÑË ÎÏÒÍÁÌØÎÉÊ X-ÓÅÒ×ÅÒ Õ +ÒÅÛÔ¦ צÄÎÏÛÅÎØ. úÁÚ×ÉÞÁÊ ÊÏÇÏ ×ÉËÏÒÉÓÔÏ×ÕÀÔØ ÄÌÑ ÐÅÒÅצÒËÉ ÓÅÒ×ÅÒ¦×. +÷ÉËÏÒÉÓÔÏ×ÕÀÞÉ Xvfb, ÍÏÖÎÁ ÔÅÓÔÕ×ÁÔÉ ËÏÄ mfb ÁÂÏ cfb ÄÌÑ ÂÕÄØ-ÑËϧ +ÇÌÉÂÉÎÉ ËÏÌØÏÒÕ ÔÁ ËÏÎƦÇÕÒÁæ§ ÅËÒÁÎÕ ÂÅÚ ×ÉËÏÒÉÓÔÁÎÎÑ ÒÅÁÌØÎϧ +ÁÐÁÒÁÔÕÒÉ, ÑËÁ ЦÄÔÒÉÍÕ¤ ÔÁ˦ ÒÅÖÉÍÉ. ôÁËÏÖ Xvfb ÍÏÖÎÁ ×ÉËÏÒÉÓÔÁÔÉ ÄÌÑ +ÐÅÒÅצÒËÉ X-Ë̦¤ÎÔ¦× Ú ÎÅÚ×ÉÞÎÉÍÉ ÇÌÉÂÉÎÁÍÉ ËÏÌØÏÒÕ ÔÁ ËÏÎƦÇÕÒÁæÑÍÉ +ÅËÒÁÎÕ, ÐÒÏ×ÏÄÉÔÉ ÐÁËÅÔÎÕ ÏÂÒÏÂËÕ Ú Xvfb Õ ÑËÏÓÔ¦ ÆÏÎÏ×ÏÇÏ ÒÅÎÄÅÒÅÒÁ, +ÐÒÏ×ÏÄÉÔÉ ÎÁÇÒÕÚÏÞΦ ÔÅÓÔÉ, ÄÌÑ ÄÏÐÏÍÏÇÉ Õ ÐÏÒÔÕ×ÁÎΦ X-ÓÅÒ×ÅÒÁ ÎÁ +ÎÏ×Õ ÐÌÁÔÆÏÒÍÕ ÔÁ ÚÁÐÕÓËÕ ÐÒÏÇÒÁÍ, ÑËÉÍ ÒÅÁÌØÎÏ ÎÅ ÐÏÔÒ¦ÂÅÎ X-ÓÅÒ×ÅÒ, +ÁÌÅ Ñ˦ ÎÁÐÏÌÑÇÁÀÔØ ÎÁ ÔÏÍÕ, ÝÏ צΠÂÕ× ÄÏÓÔÕÐÎÉÊ. + +ñËÝÏ ×ÁÍ ÐÏÔÒ¦ÂÎÏ ÔÅÓÔÕ×ÁÔÉ ×ÁÛ¦ X-ÓÅÒ×ÅÒÉ ÁÂÏ X-Ë̦¤ÎÔÉ, ×É ÍÏÖÅÔÅ +×ÓÔÁÎÏ×ÉÔÉ ÄÌÑ Ã¦¤§ æ̦ Xvfb. + %package devel Summary: X11R6 headers and programming man pages Summary(de): X11R6 Headers und man pages für Programmierer Summary(fr): Pages man de programmation Summary(pl): Pliki nag³ówkowe X11R6 +Summary(ru): âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÑ ÐÏ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÀ X11R6 Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar +Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6 Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-libs = %{version} +Requires: imake = %{version} Obsoletes: xpm-devel Provides: xpm-devel %ifarch sparc sparc64 @@ -512,19 +700,34 @@ i Xaw. Wi bibliotek mo¿esz znale¼æ w ksi±¿kach wydawnictwa O'Reilly and Associates (X Programming) polecanych przez Red Hata. +%description devel -l ru +XFree86-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ +ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. XFree86-devel +×ËÌÀÞÁÅÔ ÂÁÚÏ×ÕÀ ÂÉÂÌÉÏÔÅËÕ Xlib É ÎÁÂÏÒÙ ÐÒÉÍÉÔÉ×Ï× Xt É Xaw. + +õÓÔÁÎÏ×ÉÔÅ XFree86-devel ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, +ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ. + %description devel -l tr X istemcisi olarak çalýþacak programlar geliþtirmek için gereken statik kitaplýklar, baþlýk dosyalarý ve belgeler. Xlib kitaplýðýnýn yanýsýra Xt ve Xaw arayüz kitaplýklarýný da içerir. +%description devel -l uk +XFree86-devel ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ, ÎÅÏÂȦÄΦ +ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ. XFree86-devel ͦÓÔÉÔØ +ÂÁÚÏ×Õ Â¦Â̦ÏÔÅËÕ Xlib ÔÁ ÎÁÂÏÒÉ ÐÒÉͦÔÉ×¦× Xt ÔÁ Xaw. + +÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ +ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ. + %package driver-apm Summary: Alliance Promotion video driver Summary(pl): Sterownik do kart Alliance Promotion Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Alliance %description driver-apm Alliance Promotion driver. @@ -536,8 +739,6 @@ Sterownik do kart Alliance Promotion. Summary: Ark Logic video driver Summary(pl): Sterownik do kart Ark Logic Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -551,10 +752,9 @@ Sterownik do kart Ark Logic. Summary: ATI video driver Summary(pl): Sterownik do kart ATI Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64 %description driver-ati ATI video driver. @@ -562,14 +762,98 @@ ATI video driver. %description driver-ati -l pl Sterownik do kart ATI. +%package driver-r128 +Summary: ATI Rage 128 video driver +Summary(pl): Sterownik do kart ATI Rage 128 +Group: X11/XFree86 +Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{version}-%{release} +Requires: OpenGL +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-Rage128 + +%description driver-r128 +ATI Rage 128 video driver. + +%description driver-r128 -l pl +Sterownik do kart ATI Rage 128. + +%package driver-radeon +Summary: ATI Radeon video driver +Summary(pl): Sterownik do kart ATI Radeon +Group: X11/XFree86 +Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{version}-%{release} +Requires: XFree86-driver-ati +Requires: OpenGL +Conflicts: XFree86-driver-nvidia + +%description driver-radeon +ATI Radeon video driver. + +%description driver-radeon -l pl +Sterownik do kart ATI Radeon. + +%package driver-ati.2 +Summary: ATI video driver (ATI.2) +Summary(pl): Sterownik do kart ATI (ATI.2) +Group: X11/XFree86 +Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64 + +%description driver-ati.2 +ATI video driver (ATI.2) from gatos +(http://gatos.sourceforge.net/). + +%description driver-ati.2 -l pl +Sterownik do kart ATI (ATI.2) projektu gatos +(http://gatos.sourceforge.net/). + +%package driver-r128.2 +Summary: ATI Rage 128 video driver (ATI.2) +Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2) +Group: X11/XFree86 +Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{version}-%{release} +Requires: OpenGL +Requires: XFree86-driver-ati.2 +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-Rage128 + +%description driver-r128.2 +ATI Rage 128 video driver (ATI.2) from gatos +(http://gatos.sourceforge.net/). + +%description driver-r128.2 -l pl +Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos +(http://gatos.sourceforge.net/). + +%package driver-radeon.2 +Summary: ATI Radeon video driver (ATI.2) +Summary(pl): Sterownik do kart ATI Radeon (ATI.2) +Group: X11/XFree86 +Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{version}-%{release} +Requires: XFree86-driver-ati.2 +Requires: OpenGL +Conflicts: XFree86-driver-nvidia + +%description driver-radeon.2 +ATI Radeon video driver (ATI.2) from gatos +(http://gatos.sourceforge.net/). + +%description driver-radeon.2 -l pl +Sterownik do kart ATI Radeon (ATI.2) projektu gatos +(http://gatos.sourceforge.net/). + %package driver-chips Summary: Chips and Technologies video driver Summary(pl): Sterownik do kart na uk³adach Chips and Technologies Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-ChipsTechnologies %description driver-chips Chips and Technologies video driver. @@ -581,10 +865,9 @@ Sterownik do kart na uk Summary: Cirrus Logic video driver Summary(pl): Sterownik do kart Cirrus Logic Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Cirrus %description driver-cirrus Cirrus Logic video driver. @@ -596,10 +879,9 @@ Sterownik do kart Cirrus Logic. Summary: Cyrix video driver Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Cyrix %description driver-cyrix Cyrix video driver. @@ -611,10 +893,9 @@ Sterownik do grafiki na uk Summary: Video driver for framebuffer device Summary(pl): Sterownik korzystaj±cy z framebuffera Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-FBDev %description driver-fbdev Non-accelerated video driver for framebuffer device. @@ -626,8 +907,6 @@ Nieakcelerowany sterownik korzystaj Summary: Video driver for DRI sparc framebuffer device Summary(pl): Sterownik do framebuffera DRI na sparc Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -641,8 +920,6 @@ Sterownik do framebuffera DRI na sparc. Summary: 3Dfx Voodoo1 and Voodoo2 video driver Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -656,11 +933,11 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx. Summary: GLINT/Permedia video driver Summary(pl): Sterownik do kart GLINT i Permedia Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} Requires: OpenGL +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-3DLabs %description driver-glint GLINT/Permedia video driver. @@ -672,10 +949,9 @@ Sterownik do kart GLINT i Permedia. Summary: Number 9 I128 video driver Summary(pl): Sterownik do kart Number 9 I128 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-I128 %description driver-i128 Number 9 I128 video driver. @@ -687,10 +963,9 @@ Sterownik do kart Number 9 I128. Summary: Intel i740 video driver Summary(pl): Sterownik do kart na uk³adzie Intel i740 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-i740 %description driver-i740 Intel i740 video driver. @@ -699,30 +974,30 @@ Intel i740 video driver. Sterownik do kart na uk³adzie Intel i740. %package driver-i810 -Summary: Intel i810/i815 video driver -Summary(pl): Sterownik do grafiki na uk³adach Intel i810 i i815 +Summary: Intel i810/i815/i830 video driver +Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} Requires: OpenGL +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-i810 %description driver-i810 -Intel i810/i815 video driver. +Intel i810/i815/i830 video driver. %description driver-i810 -l pl -Sterownik do grafiki na uk³adach Intel i810 i i815. +Sterownik do grafiki na uk³adach Intel i810/i815/i830. %package driver-mga Summary: Matrox video driver Summary(pl): Sterownik do kart Matrox Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} Requires: OpenGL +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-mga %description driver-mga Matrox video driver. @@ -734,10 +1009,9 @@ Sterownik do kart Matrox. Summary: NeoMagic video driver Summary(pl): Sterownik do kart NeoMagic Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-NeoMagic %description driver-neomagic NeoMagic video driver. @@ -749,10 +1023,9 @@ Sterownik do kart NeoMagic. Summary: nVidia video driver Summary(pl): Sterownik do kart na uk³adach firmy nVidia Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-NVidia %description driver-nv nVidia video driver. Supports Riva128, RivaTNT, GeForce. @@ -760,46 +1033,13 @@ nVidia video driver. Supports Riva128, RivaTNT, GeForce. %description driver-nv -l pl Sterownik do kart na uk³adach firmy nVidia: Riva128, RivaTNT, GeForce. -%package driver-r128 -Summary: ATI Rage 128 video driver -Summary(pl): Sterownik do kart ATI Rage 128 -Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 -Requires: %{name}-modules = %{version}-%{release} -Requires: %{name}-Xserver = %{version}-%{release} -Requires: OpenGL - -%description driver-r128 -ATI Rage 128 video driver. - -%description driver-r128 -l pl -Sterownik do kart ATI Rage 128. - -%package driver-radeon -Summary: ATI Radeon video driver -Summary(pl): Sterownik do kart ATI Radeon -Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 -Requires: %{name}-modules = %{version}-%{release} -Requires: %{name}-Xserver = %{version}-%{release} -Requires: OpenGL - -%description driver-radeon -ATI Radeon video driver. - -%description driver-radeon -l pl -Sterownik do kart ATI Radeon. - %package driver-rendition Summary: Rendition video driver Summary(pl): Sterownik do kart Rendition Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Rendition %description driver-rendition Rendition/Micron video driver. @@ -811,10 +1051,9 @@ Sterownik do kart Verite firmowanych przez Rendition/Micron. Summary: S3 ViRGE/Trio3D video driver Summary(pl): Sterownik do kart na uk³adach S3 ViRGE i Trio3D Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-S3V %description driver-s3virge S3 ViRGE/Trio3D video driver. @@ -826,10 +1065,9 @@ Sterownik do kart na uk Summary: S3 Trio video driver Summary(pl): Sterownik do kart na uk³adach S3 Trio Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-S3 %description driver-s3 S3 Trio video driver. @@ -841,8 +1079,6 @@ Sterownik do kart na uk Summary: S3 Savage video driver Summary(pl): Sterownik do kart na uk³adach S3 Savage Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -856,8 +1092,6 @@ Sterownik do kart na uk Summary: Silicon Motion video driver Summary(pl): Sterownik do kart na uk³adach Silicon Motion Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -871,10 +1105,9 @@ Sterownik do kart na uk Summary: SiS video driver Summary(pl): Sterownik do kart na uk³adach SiS Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-SiS %description driver-sis SiS video driver. @@ -886,10 +1119,9 @@ Sterownik do kart na uk Summary: sunbw2 - Sun BW2 video driver Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-SunMono %description driver-sunbw2 sunbw2 - Sun BW2 video driver. @@ -901,8 +1133,6 @@ Sterownik do monochromatycznego framebuffera BW2 na Sunie. Summary: suncg14 - Sun CG14 video driver Summary(pl): Sterownik do kolorowego framebuffera CG14 na Sunie Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -916,8 +1146,6 @@ Sterownik do kolorowego framebuffera CG14 na Sunie. Summary: suncg3 - Sun CG3 video cards driver Summary(pl): Sterownik do kolorowego framebuffera CG3 na Sunie Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -931,8 +1159,6 @@ Sterownik do kolorowego framebuffera CG3 na Sunie. Summary: suncg6 - Sun GX and Turbo GX video driver Summary(pl): Sterownik do grafiki GX i Turbo GX na Sunie Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -946,8 +1172,6 @@ Sterownik do grafiki GX i Turbo GX na Sunie. Summary: sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver Summary(pl): Sterownik do kart Sun Creator, Creator 3D, Elite 3D Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -961,8 +1185,6 @@ Sterownik do kart Sun Creator, Creator 3D, Elite 3D. Summary: sunleo - Sun Leo (ZX) video cards driver Summary(pl): Sterownik do kart Sun Leo (ZX) Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -976,8 +1198,6 @@ Sterownik do kart Sun Leo (ZX). Summary: suntcx - Sun TCX video cards driver Summary(pl): Sterownik do kart Sun TCX Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} @@ -991,12 +1211,12 @@ Sterownik do kart Sun TCX. Summary: 3Dfx video driver Summary(pl): Sterownik do kart 3Dfx Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} Requires: OpenGL Requires: Glide3-DRI +Conflicts: XFree86-driver-nvidia +Obsoletes: XFree86-3dfx %description driver-tdfx 3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5. @@ -1012,10 +1232,9 @@ a Glide_V5-DRI do kart Voodoo4 lub Voodoo5. Summary: TGA video driver Summary(pl): Sterownik do kart TGA Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-TGA %description driver-tga TGA video driver. @@ -1027,10 +1246,9 @@ Sterownik do kart TGA. Summary: Trident video driver Summary(pl): Sterownik do kart Trident Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Trident %description driver-trident Trident video driver. @@ -1042,10 +1260,9 @@ Sterownik do kart Trident. Summary: Tseng Labs video driver Summary(pl): Sterownik do kart Tseng Labs Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} +Obsoletes: XFree86-Tseng XFree86-W32 %description driver-tseng Tseng Labs video driver. @@ -1054,37 +1271,34 @@ Tseng Labs video driver. Sterownik do kart firmy Tseng Labs. %package driver-vmware -Summary: VMWare SVGA video driver -Summary(pl): Sterownik karty SVGA dostêpnej pod VMware +Summary: VMWare SVGA emulated video driver +Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-modules = %{version}-%{release} Requires: %{name}-Xserver = %{version}-%{release} %description driver-vmware -VMware SVGA video driver. Necessary if you run Linux on VMware virtual machine. +VMware emulated SVGA video driver. Necessary if you run Linux on +VMware virtual machine. %description driver-vmware -l pl -Sterownik karty SVGA dostêpnej pod VMware. Przydatny je¶li uruchamiasz Linuxa -na wirtualnej maszynie VMware. - +Sterownik do emulacji karty SVGA dostêpnej pod VMware. Przydatny, +je¶li uruchamiasz Linuksa na wirtualnej maszynie VMware. %package libs Summary: X11R6 shared libraries Summary(de): X11R6 shared Libraries Summary(es): Bibliotecas compartidas X11R6 -Summary(pl): Biblioteki dzielone dla X11R6 Summary(fr): Bibliothèques partagées X11R6 +Summary(pl): Biblioteki dzielone dla X11R6 Summary(pt_BR): Bibliotecas compartilhadas X11R6 +Summary(ru): òÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ ÄÌÑ X Window System (X11R6.4) +Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4) Group: X11/XFree86 -Group(de): X11/XFree86 -Group(es): X11/XFree86 -Group(fr): X11/XFree86 -Group(pl): X11/XFree86 -Group(pt_BR): X11/XFree86 -PreReq: /sbin/ldconfig -PreReq: grep +Requires(post,postun): /sbin/ldconfig +Requires(post,postun): grep +Requires(postun): fileutils +Requires: %{name}-common = %{version} Obsoletes: xpm Provides: xpm @@ -1133,27 +1347,51 @@ program oszczêdno¶ci miejsca potrzebnego do uruchamiania aplikacji X Window na komputerach bez X serwera (np. przez sieæ). +%description libs -l pt_BR +Este pacote contém bibliotecas compartilhadas que a maioria dos +programas X precisam para rodar corretamente. Eles estão em um pacote +separado para reduzir o espaço em disco necessário para rodar +aplicações X em uma máquina sem um servidor X (através da rede). + %description libs -l tr Bu paket X programlarýnýn düzgün çalýþabilmeleri için gereken kitaplýklarý içerir. Bunlar, X programlarýný (sunucu olsun olmasýn) çalýþtýrmak için gerekli disk alanýný azaltmak için ayrý bir paket olarak sunulmuþtur. -%description libs -l pt_BR -Este pacote contém bibliotecas compartilhadas que a maioria dos -programas X precisam para rodar corretamente. Eles estão em um pacote -separado para reduzir o espaço em disco necessário para rodar -aplicações X em uma máquina sem um servidor X (através da rede). +%description libs -l ru +XFree86-libs ÓÏÄÅÒÖÉÔ ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÙ ÄÌÑ +ÒÁÂÏÔÙ ÂÏÌØÛÉÎÓÔ×Õ ÐÒÏÇÒÁÍÍ ÄÌÑ X. üÔÉ ÂÉÂÌÉÏÔÅËÉ ×ÙÎÅÓÅÎÙ × ÏÔÄÅÌØÎÙÊ +ÐÁËÅÔ ÞÔÏÂÙ ÓÜËÏÎÏÍÉÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï, ÎÅÏÂÈÏÄÉÍÏÅ ÄÌÑ ÚÁÐÕÓËÁ +ÐÒÉÌÏÖÅÎÉÊ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÁ (ÎÁÐÒÉÍÅÒ, ÐÏ ÓÅÔÉ). + +åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System ÎÁ ×ÁÛÅÊ ÍÁÛÉÎÅ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ +ÕÓÔÁÎÏ×ÉÔØ XFree86-libs. ôÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ: +XFree86, ÏÄÉÎ ÉÌÉ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XFree86, Xconfigurator, +XFree86-xfs. + +åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, +×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ XFree86-devel. + +%description libs -l uk +XFree86-libs ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ, ËÏÔÒ¦ +ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÂÏÔÉ Â¦ÌØÛÏÓÔ¦ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ ÄÌÑ X. 㦠¦Â̦ÏÔÅËÉ +×ÉÎÅÓÅΦ × ÏËÒÅÍÉÊ ÐÁËÅÔ ÄÌÑ ÅËÏÎÏͦ§ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÏÒÕ, ÎÅÏÂȦÄÎÏÇÏ +ÄÌÑ ÚÁÐÕÓËÕ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÕ (ÎÁÐÒÉËÌÁÄ, +ÐÏ ÍÅÒÅÖ¦). + +ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System ÎÁ ×ÁÛ¦Ê ÍÁÛÉΦ, ×ÁÍ ÎÅÏÂȦÄÎÏ +×ÓÔÁÎÏ×ÉÔÉ XFree86-libs. ôÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: +XFree86, ÏÄÉÎ ÁÂÏ ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XFree86, Xconfigurator, +XFree86-xfs. + +ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ +ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel. %package modules Summary: Modules with X servers extensions Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ Group: X11/XFree86 -Group(de): X11/XFree86 -Group(es): X11/XFree86 -Group(fr): X11/XFree86 -Group(pl): X11/XFree86 -Group(pt_BR): X11/XFree86 %description modules Modules with X servers extensions. @@ -1161,12 +1399,40 @@ Modules with X servers extensions. %description modules -l pl Wspólne dla wszystkich X serwerów modu³y rozszerzeñ. +%package module-PEX +Summary: PEX extension module +Summary(pl): Modu³ rozszerzenia PEX +Group: X11/XFree86 +Requires: %{name}-modules = %{version} + +%description module-PEX +PEX extension module for X server. Since XFree86 4.2.0 it's no longer +included by default. + +%description module-PEX -l pl +Modu³ rozszerzenia PEX dla X serwera. Od wersji XFree86 4.2.0 nie jest +ju¿ do³±czane domy¶lnie. + +%package module-XIE +Summary: XIE extension module +Summary(pl): Modu³ rozszerzenia XIE +Group: X11/XFree86 +Requires: %{name}-modules = %{version} + +%description module-XIE +XIE (X Image Extension) extension module for X server. Since XFree86 +4.2.0 it's no longer included by default. + +%description module-XIE -l pl +Modu³ rozszerzenia XIE (X Image Extension) dla X serwera. Od wersji +XFree86 4.2.0 nie jest ju¿ do³±czane domy¶lnie. + %package setup Summary: Graphical configuration tool for XFree86 Summary(pl): Graficzny konfigurator dla XFree86 +Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86 +Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-Xserver = %{version} Obsoletes: XFree86-xf86cfg @@ -1182,17 +1448,18 @@ skonfigurowanie ustawie ró¿nych rzeczy. Jednak¿e jest wolny i wymaga dostêpno¶ci serwera do standardowej 16-kolorowej VGA. +%description setup -l ru +õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86. + +%description setup -l uk +õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86. + %package static Summary: X11R6 static libraries Summary(pl): Biblioteki statyczne X11R6 +Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6 +Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6 Group: X11/Libraries -Group(de): X11/Libraries -Group(es): X11/Bibliotecas -Group(fr): X11/Librairies -Group(pl): X11/Biblioteki -Group(pt_BR): X11/Bibliotecas -Group(ru): X11/âÉÂÌÉÏÔÅËÉ -Group(uk): X11/â¦Â̦ÏÔÅËÉ Requires: %{name}-devel = %{version} %ifarch sparc sparc64 Obsoletes: X11R6.1-devel @@ -1206,14 +1473,24 @@ X11R6 static libraries. %description static -l pl Biblioteki statyczne X11R6. +%description static -l ru +XFree86-static ×ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ +ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. ÓÏÂÒÁÎÎÙÅ ÐÒÏÇÒÁÍÍÙ, +ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ. + +%description static -l uk +XFree86-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ +ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ. + %package tools Summary: Various tools for XFree86 Summary(pl): Ró¿ne narzêdzia dla XFree86 +Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86 +Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86 Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name} >= %{version} Requires: XFree86-libs = %{version} +Requires: man-config Obsoletes: X11R6-contrib %description tools @@ -1246,12 +1523,59 @@ klienci X, b Ten pakiet zawiera aplikacje, które by³y w X11R6-contrib w starszych wersjach X. +%description tools -l ru +òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ X, ×ËÌÀÞÁÑ listres, xbiff, xedit, xeyes, +xcalc, xload, xman É ÄÒÕÇÉÅ. + +åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System, ×ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ +XFree86-tools. ôÁËÖÅ ×ÁÍ ÔÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÉÅ ÐÁËÅÔÙ: +XFree86, Xconfigurator, XFree86-xfs É XFree86-libs. ÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÁÄÏ +ÕÓÔÁÎÏ×ÉÔØ É ÄÒÕÇÉÅ ÐÁËÅÔÙ ÛÒÉÆÔÏ× XFree86. + +åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, +×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ XFree86-devel. + +üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ×ÓÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ ÒÁÎØÛÅ ×ËÌÀÞÁÌÉÓØ × +X11R6-contrib. + +%description tools -l uk +ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ X, ×ËÌÀÞÁÀÞÉ listres, xbiff, xedit, xeyes, +xcalc, xload, xman ÔÁ ¦ÎÛ¦. + +ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System, ×ÁÍ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ +XFree86-tools. ôÁËÏÖ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: XFree86, +Xconfigurator, XFree86-xfs ÔÁ XFree86-libs. íÏÖÌÉ×Ï, ×ÁÍ ÔÒÅÂÁ +×ÓÔÁÎÏ×ÉÔÉ Ê ¦ÎÛ¦ ÐÁËÅÔÉ ÛÒÉÆÔ¦× XFree86. + +ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ +ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ XFree86-devel. + +ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib. + +%package -n imake +Summary: C preprocessor interface to the make utility +Summary(pl): Miedzymordzie do make oparte o preprocesor C +Group: Development/Building + +%description -n imake +Imake is used to generate Makefiles from a template, a set of cpp +macro functions, and a per-directory input file called an Imakefile. +This allows machine dependencies (such as compiler options, alternate +command names, and special make rules) to be kept separate from the +descriptions of the various items to be built. + +%description -n imake -l pl +Imake jest u¿ywany do generowania plików Makefile na bazie szablonu, +zbioru makr preprocesora C oraz (dla ka¿dego podkatalogu) pliku +wej¶ciowego Imakefile. Pozwala to na oddzielenie informacji zale¿nych +od ¶rodowiska kompilacji (takich jak opcje kompilatora, alternatywne +nazwy komend i regu³y specjalne) od opisu ró¿nych elementów które maj± +byæ kompilowane. + %package -n sessreg Summary: sessreg - manage utmp/wtmp entries for non-init clients Summary(pl): Program do zarz±dzania wpisami w utmp/wtmp Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 %description -n sessreg sessreg is a simple program for managing utmp/wtmp entries for xdm @@ -1272,11 +1596,9 @@ indeksowanych po %package -n twm Summary: Tab Window Manager for the X Window System Summary(pl): Twm - podstawowy zarz±dca okien dla X Window System +Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ +Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ Group: X11/Window Managers -Group(de): X11/Fenstermanager -Group(es): X11/Administraadores De Ventanas -Group(fr): X11/Gestionnaires De Fenêtres -Group(pl): X11/Zarz±dcy Okien Requires: XFree86-libs = %{version} %description -n twm @@ -1291,12 +1613,16 @@ ramki okien, par ustawianie focusu klikniêciem lub po³o¿eniem wska¼nika myszy, definiowalne przypisania klawiszy i przycisków myszy. +%description -n twm -l ru +ðÒÏÓÔÏÊ ËÏÍÐÁËÔÎÉÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ. + +%description -n twm -l uk +ðÒÏÓÔÉÊ ËÏÍÐÁËÔÎÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ. + %package -n xauth Summary: xauth - X authority file utility Summary(pl): xauth - narzêdzie do plików X authority Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-libs = %{version} %description -n xauth @@ -1316,16 +1642,17 @@ logowania lub udost %package -n xdm Summary: xdm - X Display Manager with support for XDMCP, host chooser Summary(pl): XDM - display mened¿er z obs³ug± XDMCP i wybieraniem hostów +Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X +Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 +PreReq: rc-scripts +Requires(post,preun): /sbin/chkconfig Requires: %{name} = %{version} Requires: pam >= 0.71 Requires: %{name}-libs = %{version} Requires: sessreg = %{version} Requires: /usr/X11R6/bin/sessreg Provides: XDM -PreReq: chkconfig Obsoletes: XFree86-xdm Obsoletes: gdm Obsoletes: kdm @@ -1341,20 +1668,28 @@ Xdm zarz zdalnych serwerach. Zosta³ zaprojektowany zgodnie z potrzebami X terminali oraz standardem X Consortium XDMCP. +%description -n xdm -l ru +íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X. + +%description -n xdm -l uk +íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X. + %package -n xfs Summary: Font server for XFree86 Summary(pl): Serwer fontów dla XFree86 +Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System +Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System Group: X11/XFree86 -Group(de): X11/XFree86 -Group(pl): X11/XFree86 Requires: %{name}-libs = %{version} -PreReq: chkconfig -PreReq: /usr/sbin/useradd -PreReq: /usr/sbin/groupadd -PreReq: /usr/sbin/userdel -PreReq: /usr/sbin/groupdel -PreReq: /usr/bin/getgid -PreReq: /bin/id +Requires: XFree86-fonts-base +PreReq: rc-scripts +Requires(pre): /bin/id +Requires(pre): /usr/bin/getgid +Requires(pre): /usr/sbin/useradd +Requires(pre): /usr/sbin/groupadd +Requires(post,preun): /sbin/chkconfig +Requires(postun): /usr/sbin/groupdel +Requires(postun): /usr/sbin/userdel Obsoletes: xfsft XFree86-xfs %description -n xfs @@ -1367,6 +1702,28 @@ installed on the remote computer. Pakiet zawiera serwer fontów dla XFree86. Mo¿e udostêpniaæ fonty dla X serwerów lokalnych lub zdalnych. +%description -n xfs -l ru +XFree86-xfs ÓÏÄÅÒÖÉÔ ÓÅÒ×ÅÒ ÛÒÉÆÔÏ× ÄÌÑ XFree86. Xfs ÔÁËÖÅ ÍÏÖÅÔ +ÐÒÅÄÏÓÔÁ×ÌÑÔØ ÛÒÉÆÔÙ ÕÄÁÌÅÎÎÙÍ X-ÓÅÒ×ÅÒÁÍ. õÄÁÌÅÎÎÁÑ ÓÉÓÔÅÍÁ ÂÕÄÅÔ +ÓÐÏÓÏÂÎÁ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÅ ÛÒÉÆÔÙ, ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÒ×ÅÒÅ ÛÒÉÆÔÏ×, +ÄÁÖÅ ÅÓÌÉ ÏÎÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ. + +÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ XFree86-xfs ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window +System. ôÁËÖÅ ×ÁÍ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ: XFree86, +ÐÁËÅÔ(Ù) ÛÒÉÆÔÏ× XFree86, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ, Xconfigurator +É XFree86-libs. + +%description -n xfs -l uk +XFree86-xfs ͦÓÔÉÔØ ÓÅÒ×ÅÒ ÛÒÉÆÔ¦× ÄÌÑ XFree86. Xfs ÔÁËÏÖ ÍÏÖÅ +ÎÁÄÁ×ÁÔÉ ÛÒÉÆÔÉ ×¦ÄÄÁÌÅÎÉÍ X-ÓÅÒ×ÅÒÁÍ. ÷¦ÄÄÁÌÅÎÁ ÓÉÓÔÅÍÁ ÚÍÏÖÅ +×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓ¦ ÛÒÉÆÔÉ, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ÓÅÒ×ÅÒ¦ ÛÒÉÆÔ¦×, ÎÁצÔØ +ÑËÝÏ ×ÏÎÉ ÎÅ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦. + +÷É ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ XFree86-xfs ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window +System. ôÁËÏÖ ×ÁÍ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÎÁÓÔÕÐΦ ÐÁËÅÔÉ: XFree86, +ÐÁËÅÔ(É) ÛÒÉÆÔ¦× XFree86, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator +ÔÁ XFree86-libs. + #--- %prep --------------------------- %prep @@ -1377,7 +1734,7 @@ serwer %patch3 -p1 %patch4 -p1 %patch5 -p0 -# Not ready yet +# not ready yet #%patch6 -p0 %patch7 -p1 %patch8 -p1 @@ -1400,22 +1757,56 @@ serwer %patch25 -p1 %patch26 -p1 %patch27 -p1 -%patch28 -p1 +%ifarch sparc sparc64 +# needs updating (14 rejects) +#%patch28 -p1 +%endif %patch29 -p1 %patch30 -p1 %patch31 -p1 %patch32 -p1 %patch33 -p1 %patch34 -p1 -%patch35 -p1 -%patch36 -p1 +%ifarch ppc +%patch35 +%endif +%{?_without_tdfx:%patch35} +%patch36 -p0 %patch37 -p1 %patch38 -p1 -%ifarch alpha -%patch39 -p0 -%endif +#%patch39 -p1 +%patch40 -p0 +%patch41 -p1 +%patch42 -p1 +%patch43 -p1 +%patch44 -p1 +%patch45 -p1 +%patch46 -p1 +%{!?_without_tdfx:%patch47 -p0} +%{!?_without_tdfx:%patch48 -p0} +%{!?_without_tdfx:%patch49 -p1} +#%patch50 -p0 +%{!?_without_tdfx:%patch51 -p0} +#%patch52 -p1 +#%patch53 -p1 +%patch54 -p1 +%patch55 -p0 +%patch56 -p1 +%{!?debug:%patch57 -p1} +%patch58 -p0 +%{?_without_tdfx:%patch59 -p0} +%patch60 -p1 +%patch61 -p0 +%patch62 -p0 +%patch63 -p1 +%patch64 -p1 + rm -f xc/config/cf/host.def -tar zx -f %{SOURCE15} -C xc/programs/Xserver/hw/xfree86/drivers/ + +# New ATI drivers +cd xc/programs/Xserver/hw/xfree86/drivers +bzcat %{SOURCE2} | tar x +# ati.2 directory #--- %build -------------------------- @@ -1426,17 +1817,27 @@ tar zx -f %{SOURCE15} -C xc/programs/Xserver/hw/xfree86/drivers/ "CXXOPTIONS=%{rpmcflags}" \ "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" +%ifnarch alpha +%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles +%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" all \ + "BOOTSTRAPCFLAGS=%{rpmcflags}" \ + "CCOPTIONS=%{rpmcflags}" \ + "CXXOPTIONS=%{rpmcflags}" \ + "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" +%endif + #--- %install ------------------------ %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysconfig} \ - $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl \ + $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/{cs,da,de,es,fr,hu,it,ja,ko,nl,pl,pt,ru,sk,zh_CN.gb2312,zh_TW.big5} \ $RPM_BUILD_ROOT%{_datadir}/{misc,sounds} \ + $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT/usr/{bin,include,lib} \ $RPM_BUILD_ROOT/var/{log,lib/xkb} \ - $RPM_BUILD_ROOT{%{_applnkdir}/{Utilities,Terminals},%{_pixmapsdir}/mini} \ - $RPM_BUILD_ROOT%{_wmpropsdir} + $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \ + $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir}} %{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \ "DOCDIR=/usr/share/doc/%{name}-%{version}" \ @@ -1449,17 +1850,26 @@ install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysc "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \ install install.man +%ifnarch alpha +install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri} +install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_drv.o \ + $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers +install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \ + $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri + +%endif + # setting default X rm -f $RPM_BUILD_ROOT%{_bindir}/X ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X # setting ghost X in /etc/X11 -- xf86config will fix this ... -ln -sf ../..%{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X +ln -sf %{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X # add X11 links in /usr/bin, /usr/lib /usr/include -ln -sf ../X11R6/include/X11 $RPM_BUILD_ROOT/usr/include/X11 -ln -sf ../X11R6/lib/X11 $RPM_BUILD_ROOT/usr/lib/X11 -ln -sf ../X11R6/bin $RPM_BUILD_ROOT/usr/bin/X11 +ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11 +ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11 +ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11 # fix libGL*.so links rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so @@ -1468,27 +1878,31 @@ ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so # set up PLD xdm config rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*} -install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps/ -install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/ - -install %{SOURCE2} $RPM_BUILD_ROOT/etc/pam.d/xdm -install %{SOURCE3} $RPM_BUILD_ROOT/etc/pam.d/xserver -install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm -install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs -install %{SOURCE6} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config -install %{SOURCE7} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm - -install %{SOURCE8} $RPM_BUILD_ROOT/etc/sysconfig/xdm -install %{SOURCE9} $RPM_BUILD_ROOT/etc/sysconfig/xfs - -install %{SOURCE10} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop -install %{SOURCE11} $RPM_BUILD_ROOT%{_applnkdir}/Utilities -install %{SOURCE12} $RPM_BUILD_ROOT%{_applnkdir}/Utilities -install %{SOURCE13} $RPM_BUILD_ROOT%{_applnkdir}/Terminals - -install %{SOURCE14} $RPM_BUILD_ROOT%{_datadir}/pixmaps - -bzip2 -dc %{SOURCE16} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps +install xdm-xinitrc-*/{*Console,Xaccess,Xsession,Xsetup*} $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm + +install %{SOURCE4} $RPM_BUILD_ROOT/etc/pam.d/xdm +install %{SOURCE5} $RPM_BUILD_ROOT/etc/pam.d/xserver +install %{SOURCE6} $RPM_BUILD_ROOT/etc/rc.d/init.d/xdm +install %{SOURCE7} $RPM_BUILD_ROOT/etc/rc.d/init.d/xfs +install %{SOURCE8} $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs/config +install %{SOURCE9} $RPM_BUILD_ROOT%{_libdir}/X11/app-defaults/pl/XTerm + +install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/xdm +install %{SOURCE11} $RPM_BUILD_ROOT/etc/sysconfig/xfs + +install %{SOURCE20} $RPM_BUILD_ROOT%{_wmpropsdir}/twm.desktop +install %{SOURCE21} $RPM_BUILD_ROOT%{_applnkdir}/Amusements +install %{SOURCE22} $RPM_BUILD_ROOT%{_applnkdir}/Editors +install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals +install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \ + $RPM_BUILD_ROOT%{_applnkdir}/Utilities +install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps +install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \ + %{SOURCE36} %{SOURCE37} \ + $RPM_BUILD_ROOT%{_pixmapsdir} + +bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} > $RPM_BUILD_ROOT/etc/security/console.apps/xserver > $RPM_BUILD_ROOT/etc/security/blacklist.xserver @@ -1500,8 +1914,7 @@ ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp -ln -sf ../../../share/doc/%{name}-%{version} \ - $RPM_BUILD_ROOT%{_libdir}/X11/doc +ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def @@ -1534,6 +1947,12 @@ rm -rf $RPM_BUILD_ROOT %post DPS -p /sbin/ldconfig %postun DPS -p /sbin/ldconfig +%post PEX -p /sbin/ldconfig +%postun PEX -p /sbin/ldconfig + +%post XIE -p /sbin/ldconfig +%postun XIE -p /sbin/ldconfig + %post OpenGL-libs -p /sbin/ldconfig %postun OpenGL-libs -p /sbin/ldconfig @@ -1561,13 +1980,14 @@ fi %triggerpostun modules -- XFree86-modules < 4.0.2 if [ -d /usr/X11R6/lib/X11/xkb ]; then rm -rf /usr/X11R6/lib/X11/xkb - ln -sf ../../../../etc/X11/xkb /usr/X11R6/lib/X11/xkb + ln -sf /etc/X11/xkb /usr/X11R6/lib/X11/xkb fi %post -n xdm /sbin/chkconfig --add xdm if [ -f /var/lock/subsys/xdm ]; then - /etc/rc.d/init.d/xdm restart >&2 + echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2 + echo "WARNING: it will terminate all sessions opened from xdm!" >&2 else echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2 fi @@ -1583,7 +2003,7 @@ fi %pre -n xfs if [ -n "`/usr/bin/getgid xfs`" ]; then if [ "`/usr/bin/getgid xfs`" != "56" ]; then - echo "Warning: group xfs hasn't gid=56. Correct this before installing xfs." 1>&2 + echo "Error: group xfs doesn't have GID=56. Correct this before installing xfs." 1>&2 exit 1 fi else @@ -1591,7 +2011,7 @@ else fi if [ -n "`/bin/id -u xfs 2>/dev/null`" ]; then if [ "`/bin/id -u xfs`" != "56" ]; then - echo "Warning: user xfs hasn't uid=56. Corrent this before installing xfs." 1>&2 + echo "Error: user xfs doesn't have UID=56. Correct this before installing xfs." 1>&2 exit 1 fi else @@ -1629,9 +2049,7 @@ fi %doc %{_libdir}/X11/doc %endif -%{_sysconfdir}/X11/XftConfig - -%dir %{_libdir}/X11/app-defaults +%{_libdir}/X11/app-defaults/UXTerm %{_libdir}/X11/app-defaults/XCalc %{_libdir}/X11/app-defaults/XCalc-color %{_libdir}/X11/app-defaults/XClipboard @@ -1641,46 +2059,37 @@ fi %{_libdir}/X11/app-defaults/XLogo-color %{_libdir}/X11/app-defaults/XSm %{_libdir}/X11/app-defaults/XTerm +%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm %{_libdir}/X11/app-defaults/XTerm-color -%ifnarch sparc sparc64 -%{_libdir}/X11/app-defaults/XF86Cfg -%endif %attr(755,root,root) %{_libdir}/X11/lbxproxy %attr(755,root,root) %{_libdir}/X11/proxymngr %attr(755,root,root) %{_libdir}/X11/rstart -%attr(755,root,root) %{_libdir}/X11/xserver %attr(755,root,root) %{_libdir}/X11/fonts %attr(755,root,root) %{_libdir}/X11/xinit %attr(755,root,root) %{_libdir}/X11/xsm +%dir /etc/X11/xinit %dir /etc/X11/lbxproxy +/etc/X11/lbxproxy/* %dir /etc/X11/proxymngr +/etc/X11/proxymngr/* %dir /etc/X11/rstart +/etc/X11/rstart/config +%attr(755,root,root) /etc/X11/rstart/rstartd.real %dir /etc/X11/rstart/commands +/etc/X11/rstart/commands/x +/etc/X11/rstart/commands/x11 +%attr(755,root,root) /etc/X11/rstart/commands/*List* %dir /etc/X11/rstart/commands/x11r6 +%attr(755,root,root) /etc/X11/rstart/commands/x11r6/* %dir /etc/X11/rstart/contexts -%dir /etc/X11/xserver +/etc/X11/rstart/contexts/* %dir /etc/X11/xsm -%dir /etc/X11/xinit - -/etc/X11/lbxproxy/* -/etc/X11/proxymngr/* -%attr(-,root,root) /etc/X11/rstart/config -%attr(-,root,root) /etc/X11/rstart/rstartd.real -%attr(-,root,root) /etc/X11/rstart/commands/x -%attr(-,root,root) /etc/X11/rstart/commands/x11 -%attr(-,root,root) /etc/X11/rstart/commands/*List* -%attr(-,root,root) /etc/X11/rstart/commands/x11r6/* -%attr(-,root,root) /etc/X11/rstart/contexts/* -/etc/X11/xserver/SecurityPolicy /etc/X11/xsm/* -%lang(pl) %{_libdir}/X11/app-defaults/pl - %dir %{_libdir}/X11/x11perfcomp %attr(755,root,root) %{_libdir}/X11/x11perfcomp/* -%{_libdir}/X11/*.txt %attr(755,root,root) %{_bindir}/Xmark %attr(755,root,root) %{_bindir}/appres @@ -1693,6 +2102,7 @@ fi %attr(755,root,root) %{_bindir}/iceauth %attr(755,root,root) %{_bindir}/lbxproxy %attr(755,root,root) %{_bindir}/lndir +%attr(755,root,root) %{_bindir}/luit %attr(755,root,root) %{_bindir}/makeg %attr(755,root,root) %{_bindir}/makestrs %attr(755,root,root) %{_bindir}/mergelib @@ -1708,6 +2118,7 @@ fi %attr(755,root,root) %{_bindir}/smproxy %attr(755,root,root) %{_bindir}/startx %attr(755,root,root) %{_bindir}/sxpm +%attr(755,root,root) %{_bindir}/uxterm %attr(755,root,root) %{_bindir}/xcmsdb %attr(755,root,root) %{_bindir}/xconsole %attr(755,root,root) %{_bindir}/xcutsel @@ -1718,7 +2129,6 @@ fi %attr(755,root,root) %{_bindir}/xhost %attr(755,root,root) %{_bindir}/xinit %attr(755,root,root) %{_bindir}/xkbbell -%attr(755,root,root) %{_bindir}/xkbcomp %attr(755,root,root) %{_bindir}/xkbevd %attr(755,root,root) %{_bindir}/xkbprint %attr(755,root,root) %{_bindir}/xkbvleds @@ -1746,7 +2156,7 @@ fi %{_includedir}/X11/bitmaps %{_includedir}/X11/pixmaps -%{_applnkdir}/Utilities/* +%{_applnkdir}/Utilities/xconsole.desktop %{_applnkdir}/Terminals/* %{_libdir}/X11/app-defaults/Xvidtune %{_pixmapsdir}/x* @@ -1762,10 +2172,9 @@ fi %{_mandir}/man1/editres.1* %{_mandir}/man1/iceauth.1* %{_mandir}/man1/lbxproxy.1* -%ifnarch alpha %{_mandir}/man1/libxrx.1* -%endif %{_mandir}/man1/lndir.1* +%{_mandir}/man1/luit.1x* %{_mandir}/man1/makestrs.1* %{_mandir}/man1/makeg.1* %{_mandir}/man1/mkdirhier.1* @@ -1789,7 +2198,6 @@ fi %{_mandir}/man1/xgamma.1* %{_mandir}/man1/xhost.1* %{_mandir}/man1/xinit.1* -%{_mandir}/man1/xkbcomp.1* %{_mandir}/man1/xkbevd.1* %{_mandir}/man1/xkbprint.1* %{_mandir}/man1/xlsatoms.1* @@ -1825,6 +2233,15 @@ fi %lang(pl) %{_mandir}/pl/man1/xinit.1* %lang(pl) %{_mandir}/pl/man1/xwd.1* +%files common +%defattr(644,root,root,755) +/usr/bin/X11 +/usr/lib/X11 +%dir %{_bindir} +%dir %{_libdir} +%dir %{_libdir}/X11 +%{_libdir}/X11/rgb.txt + %files DPS %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/makepsres @@ -1852,24 +2269,51 @@ fi %{_libdir}/libdpstk.a %{_libdir}/libpsres.a +%ifnarch alpha sparc64 ia64 s390x +%files PEX +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libPEX5.so.*.* + +%files PEX-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libPEX5.so +%{_includedir}/X11/PEX5 + +%files PEX-static +%defattr(644,root,root,755) +%{_libdir}/libPEX5.a +%endif + +%files XIE +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libXIE.so.*.* + +%files XIE-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libXIE.so +%{_includedir}/X11/extensions/XIE* + +%files XIE-static +%defattr(644,root,root,755) +%{_libdir}/libXIE.a + %files OpenGL-core %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/glxgears %attr(755,root,root) %{_libdir}/libGL.so.*.* -%ifnarch sparc sparc64 +%attr(755,root,root) %{_libdir}/libGL.so %attr(755,root,root) %{_libdir}/modules/extensions/libglx.a %attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a -%endif +%{_mandir}/man1/glxgears.1x* %files OpenGL-devel %defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libGL*.so -%ifnarch alpha +%attr(755,root,root) %{_libdir}/libGLU.so %attr(755,root,root) %{_libdir}/libOSMesa*.so -%endif %{_libdir}/libGLw.a %dir %{_includedir}/GL %attr(644,root,root) %{_includedir}/GL/* -%{_mandir}/man3/glX* +%{_mandir}/man3/gl[A-Z]* %{_mandir}/man3/glu* %{_mandir}/man3/GLw* @@ -1877,18 +2321,14 @@ fi %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/glxinfo %attr(755,root,root) %{_libdir}/libGLU.so.*.* -%ifnarch alpha %attr(755,root,root) %{_libdir}/libOSMesa.so.*.* -%endif %{_mandir}/man1/glxinfo.1* %files OpenGL-static %defattr(644,root,root,755) %{_libdir}/libGL.a %{_libdir}/libGLU.a -%ifnarch alpha -%attr(755,root,root) %{_libdir}/libOSMesa*.a -%endif +%{_libdir}/libOSMesa*.a %files Xnest %defattr(644,root,root,755) @@ -1924,77 +2364,63 @@ fi %files devel %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/gccmakedep %attr(755,root,root) %{_bindir}/bdftopcf -%attr(755,root,root) %{_libdir}/libX*.so +%attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so %attr(755,root,root) %{_libdir}/libI*.so -%ifnarch alpha -%attr(755,root,root) %{_libdir}/libP*.so -%endif %attr(755,root,root) %{_libdir}/libS*.so -%ifnarch alpha %attr(755,root,root) %{_libdir}/libx*.so -%endif +%{_libdir}/libfntstubs.a +%{_libdir}/libfontenc.a %{_libdir}/libFS.a +%{_libdir}/libI810XvMC.a +%{_libdir}/liboldX.a %{_libdir}/libXau.a %{_libdir}/libXdmcp.a +%{_libdir}/libxf86config.a %{_libdir}/libXfontcache.a +%{_libdir}/libXinerama.a +%{_libdir}/libxkbfile.a +%{_libdir}/libxkbui.a +%{_libdir}/libXrandr.a %{_libdir}/libXss.a +%{_libdir}/libXTrap.a +%{_libdir}/libXv.a +%{_libdir}/libXvMC.a %{_libdir}/libXxf86dga.a %{_libdir}/libXxf86misc.a %{_libdir}/libXxf86rush.a %{_libdir}/libXxf86vm.a -%{_libdir}/liboldX.a -%{_libdir}/libxkbfile.a -%{_libdir}/libxkbui.a -%{_libdir}/libXv.a -%{_libdir}/libfntstubs.a -%{_libdir}/libxf86config.a -%{_libdir}/libXinerama.a %{_includedir}/X11/*.h %{_includedir}/X11/ICE -%ifnarch alpha -%{_includedir}/X11/PEX5 -%endif %{_includedir}/X11/PM %{_includedir}/X11/SM %{_includedir}/X11/Xaw %{_includedir}/X11/Xft %{_includedir}/X11/Xmu -%{_includedir}/X11/extensions +%dir %{_includedir}/X11/extensions +%{_includedir}/X11/extensions/[^X]*.h +%{_includedir}/X11/extensions/X[^I]*.h +%{_includedir}/X11/extensions/XI.h +%{_includedir}/X11/extensions/XI[^E]*.h %{_includedir}/X11/fonts %{_includedir}/xf86*.h %{_libdir}/X11/config -%attr(755,root,root) %{_bindir}/imake -%attr(755,root,root) %{_bindir}/makedepend -%attr(755,root,root) %{_bindir}/xmkmf - -%{_mandir}/man1/imake.1* -%{_mandir}/man1/makedepend.1* -%{_mandir}/man1/xmkmf.1* %{_mandir}/man3/[A-EH-Z]* -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-apm %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o %{_mandir}/man4/apm* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-ark %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o %endif -%ifnarch alpha -%files driver-ati -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o -#%{_mandir}/man4/ati* -%endif - %ifnarch sparc sparc64 alpha %files driver-chips %defattr(644,root,root,755) @@ -2002,14 +2428,14 @@ fi %{_mandir}/man4/chips* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-cirrus %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o %{_mandir}/man4/cirrus* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-cyrix %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o @@ -2023,11 +2449,11 @@ fi %{_mandir}/man4/fbdev* %endif -%ifnarch sparc sparc64 alpha -%files driver-glide -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o -%{_mandir}/man4/glide* +%ifnarch sparc sparc64 alpha ppc +%{!?_without_tdfx:%files driver-glide} +%{!?_without_tdfx:%defattr(644,root,root,755)} +%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o} +%{!?_without_tdfx:%{_mandir}/man4/glide*} %endif %files driver-glint @@ -2038,25 +2464,26 @@ fi %endif %{_mandir}/man4/glint* -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-i128 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o %{_mandir}/man4/i128* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-i740 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o %{_mandir}/man4/i740* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-i810 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so +%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so %{_mandir}/man4/i810* %endif @@ -2068,7 +2495,7 @@ fi %{_mandir}/man4/mga* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-neomagic %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o @@ -2082,30 +2509,56 @@ fi %{_mandir}/man4/nv* %endif -%ifnarch sparc sparc64 + +%files driver-ati +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o + %files driver-r128 %defattr(644,root,root,755) -%ifnarch alpha -%attr(755,root,root) %{_libdir}/modules/drivers/r128_drv.o -%endif +%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o %ifnarch sparc sparc64 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so %endif -%ifnarch alpha %{_mandir}/man4/r128* -%endif -%endif %files driver-radeon %defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o +%ifnarch sparc sparc64 +%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so +%endif + + %ifnarch alpha -%attr(755,root,root) %{_libdir}/modules/drivers/radeon_drv.o +%files driver-ati.2 +%defattr(644,root,root,755) +%dir %{_libdir}/modules.gatos/drivers +%attr(755,root,root) %{_libdir}/modules.gatos/drivers/ati*_drv.o +%attr(755,root,root) %{_libdir}/modules.gatos/drivers/[bfmt]*_drv.o %endif + +%ifnarch alpha +%files driver-r128.2 +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules.gatos/drivers/r128*_drv.o %ifnarch sparc sparc64 -%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so +%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o +%endif +%{_mandir}/man4/r128* %endif +%ifnarch alpha +%files driver-radeon.2 +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules.gatos/drivers/radeon*_drv.o +%attr(755,root,root) %{_libdir}/modules.gatos/drivers/saa7114_drv.o %ifnarch sparc sparc64 +%attr(755,root,root) %{_libdir}/modules.gatos/dri/radeon_dri.o +%endif +%endif + +%ifnarch sparc sparc64 ppc %files driver-rendition %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o @@ -2126,14 +2579,14 @@ fi #%{_mandir}/man4/s3* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 %files driver-savage %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o %{_mandir}/man4/savage* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 ppc %files driver-siliconmotion %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o @@ -2144,7 +2597,9 @@ fi %files driver-sis %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o +%ifnarch ppc %attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so +%endif %{_mandir}/man4/sis* %endif @@ -2198,15 +2653,15 @@ fi %{_mandir}/man4/suntcx* %endif -%ifnarch sparc sparc64 -%files driver-tdfx -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o -%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so -%{_mandir}/man4/tdfx* +%ifnarch sparc sparc64 ppc +%{!?_without_tdfx:%files driver-tdfx} +%{!?_without_tdfx:%defattr(644,root,root,755)} +%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o} +%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so} +%{!?_without_tdfx:%{_mandir}/man4/tdfx*} %endif -%ifnarch sparc sparc64 +%ifnarch sparc sparc64 ppc %files driver-tga %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o @@ -2219,7 +2674,7 @@ fi %{_mandir}/man4/trident* %endif -%ifnarch sparc sparc64 alpha +%ifnarch sparc sparc64 alpha ppc %files driver-tseng %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o @@ -2235,16 +2690,27 @@ fi %files libs -f XFree86-libs.lang %defattr(644,root,root,755) -%dir %{_libdir} -%dir %{_libdir}/X11 %{_libdir}/X11/XErrorDB %{_libdir}/X11/XKeysymDB +%dir %{_libdir}/X11/app-defaults +%lang(cs) %dir %{_libdir}/X11/app-defaults/cs +%lang(da) %dir %{_libdir}/X11/app-defaults/da +%lang(de) %dir %{_libdir}/X11/app-defaults/de +%lang(es) %dir %{_libdir}/X11/app-defaults/es +%lang(fr) %dir %{_libdir}/X11/app-defaults/fr +%lang(hu) %dir %{_libdir}/X11/app-defaults/hu +%lang(ko) %dir %{_libdir}/X11/app-defaults/ko +%lang(nl) %dir %{_libdir}/X11/app-defaults/nl +%lang(pl) %dir %{_libdir}/X11/app-defaults/pl +%lang(pt) %dir %{_libdir}/X11/app-defaults/pt +%lang(ru) %dir %{_libdir}/X11/app-defaults/ru +%lang(sk) %dir %{_libdir}/X11/app-defaults/sk +%lang(zh_CN) %dir %{_libdir}/X11/app-defaults/zh_CN.gb2312 +%lang(zh_TW) %dir %{_libdir}/X11/app-defaults/zh_TW.big5 %{_libdir}/X11/locale %dir %{_includedir} %dir %{_includedir}/X11 -%dir %{_bindir} -/usr/bin/X11 -/usr/lib/X11 +%dir %{_sbindir} /usr/include/X11 %dir %{_datadir}/locale %dir %{_datadir}/misc @@ -2252,27 +2718,22 @@ fi %dir %{_pixmapsdir} %dir %{_pixmapsdir}/mini %dir %{_wmpropsdir} -%attr(755,root,root) %{_libdir}/libX*.so.*.* +%attr(755,root,root) %{_libdir}/libX[1Ta-t]*.so.*.* %attr(755,root,root) %{_libdir}/libI*.so.*.* -%ifnarch alpha -%attr(755,root,root) %{_libdir}/libP*.so.*.* -%endif %attr(755,root,root) %{_libdir}/libS*.so.*.* -%ifnarch alpha %attr(755,root,root) %{_libdir}/libx*.so.*.* -%endif +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig %files modules %defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/xkbcomp %{_libdir}/X11/xkb %{_sysconfdir}/X11/xkb /var/lib/xkb %dir %{_libdir}/modules -%ifnarch alpha %dir %{_libdir}/modules/dri -%endif %dir %{_libdir}/modules/drivers -%ifnarch sparc sparc64 +%ifnarch sparc sparc64 ppc %{_libdir}/modules/*.uc %endif %attr(755,root,root) %{_libdir}/modules/*.a @@ -2280,7 +2741,7 @@ fi %attr(755,root,root) %{_libdir}/modules/drivers/linux %ifnarch sparc sparc64 %attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o -%ifnarch alpha +%ifnarch alpha ppc %attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o %endif %endif @@ -2288,23 +2749,27 @@ fi %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 -%ifnarch alpha -%attr(755,root,root) %{_libdir}/modules/extensions/libpex5.a -%endif %attr(755,root,root) %{_libdir}/modules/extensions/librecord.a -%attr(755,root,root) %{_libdir}/modules/extensions/libxie.a +%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.a %attr(755,root,root) %{_libdir}/modules/fonts %attr(755,root,root) %{_libdir}/modules/input %attr(755,root,root) %{_libdir}/modules/linux +%attr(755,root,root) %{_libdir}/X11/xserver +%dir /etc/X11/xserver +/etc/X11/xserver/SecurityPolicy +#%{_mandir}/man1/xtr* +%{_mandir}/man1/xkbcomp.1* %{_mandir}/man4/citron* +%{_mandir}/man4/dmc.4* %{_mandir}/man4/dynapro* %{_mandir}/man4/keyboard* %{_mandir}/man4/microtouch* %{_mandir}/man4/mouse* +%{_mandir}/man4/penmount.4* %{_mandir}/man4/v4l* %ifnarch sparc sparc64 %{_mandir}/man4/vga* -%ifnarch alpha +%ifnarch alpha ppc %{_mandir}/man4/vesa* %endif %endif @@ -2313,15 +2778,28 @@ fi %{_mandir}/man4/elographics* %{_mandir}/man4/mutouch* +%ifnarch alpha sparc64 ia64 s390x +%files module-PEX +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/extensions/libpex5.a +%endif + +%files module-XIE +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/extensions/libxie.a + %files setup %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/SuperProbe %attr(755,root,root) %{_bindir}/pcitweak +%ifnarch ppc %attr(755,root,root) %{_bindir}/scanpci +%endif %attr(755,root,root) %{_bindir}/xf86cfg %attr(755,root,root) %{_bindir}/xf86config -%{_mandir}/man1/SuperProbe.1* +%{_libdir}/X11/app-defaults/XF86Cfg +%ifnarch ppc %{_mandir}/man1/scanpci.1* +%endif %{_mandir}/man1/pcitweak.1* %{_mandir}/man1/xf86cfg.1* %{_mandir}/man1/xf86config.1* @@ -2329,12 +2807,8 @@ fi %files static %defattr(644,root,root,755) %{_libdir}/libICE.a -%ifnarch alpha -%{_libdir}/libPEX5.a -%endif %{_libdir}/libSM.a %{_libdir}/libX11.a -%{_libdir}/libXIE.a %{_libdir}/libXaw.a %{_libdir}/libXft.a %{_libdir}/libXext.a @@ -2368,7 +2842,6 @@ fi %attr(755,root,root) %{_bindir}/xfd %attr(755,root,root) %{_bindir}/xfontsel %attr(755,root,root) %{_bindir}/xgc -%attr(755,root,root) %{_bindir}/xieperf %attr(755,root,root) %{_bindir}/xload %attr(755,root,root) %{_bindir}/xmag %attr(755,root,root) %{_bindir}/xman @@ -2379,6 +2852,9 @@ fi %attr(755,root,root) %{_bindir}/xlogo %attr(755,root,root) %{_bindir}/xkill %attr(755,root,root) %{_bindir}/rman +%attr(755,root,root) %{_bindir}/xtrap* +%attr(755,root,root) %{_bindir}/texteroids +%{_libdir}/X11/xedit %{_libdir}/X11/xman.help %{_mandir}/man1/beforelight.1* %{_mandir}/man1/ico.1* @@ -2398,7 +2874,6 @@ fi %{_mandir}/man1/xfd.1* %{_mandir}/man1/xfontsel.1* %{_mandir}/man1/xgc.1* -%{_mandir}/man1/xieperf.1* %{_mandir}/man1/xload.1* %{_mandir}/man1/xmag.1* %{_mandir}/man1/xman.1* @@ -2409,6 +2884,8 @@ fi %{_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* @@ -2434,6 +2911,23 @@ fi %{_libdir}/X11/app-defaults/Xditview %{_libdir}/X11/app-defaults/Xditview-chrtr +%{_applnkdir}/Utilities/xclipboard.desktop +%{_applnkdir}/Utilities/oclock.desktop +%{_applnkdir}/Utilities/xclock.desktop +%{_applnkdir}/Editors/xedit.desktop +%{_applnkdir}/Amusements/xeyes.desktop + +%files -n imake +%defattr(644,root,root,755) +%attr(755,root,root) %{_bindir}/gccmakedep +%attr(755,root,root) %{_bindir}/imake +%attr(755,root,root) %{_bindir}/makedepend +%attr(755,root,root) %{_bindir}/xmkmf + +%{_mandir}/man1/imake.1* +%{_mandir}/man1/makedepend.1* +%{_mandir}/man1/xmkmf.1* + %files -n sessreg %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/sessreg @@ -2472,15 +2966,15 @@ fi %{_mandir}/man1/xdm.1* %dir /etc/X11/xdm -%attr(755,root,root) %config /etc/X11/xdm/GiveConsole -%attr(755,root,root) %config /etc/X11/xdm/TakeConsole -%attr(755,root,root) %config /etc/X11/xdm/Xsession -%attr(755,root,root) %config /etc/X11/xdm/Xsetup_0 -%attr(755,root,root) %config /etc/X11/xdm/Xwilling -%config /etc/X11/xdm/Xaccess -%config /etc/X11/xdm/Xresources -%config /etc/X11/xdm/Xservers -%config /etc/X11/xdm/xdm-config +%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/GiveConsole +%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/TakeConsole +%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsession +%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsetup_0 +%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xwilling +%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xaccess +%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xresources +%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xservers +%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/xdm-config /etc/X11/xdm/pixmaps /etc/X11/xdm/authdir @@ -2490,8 +2984,7 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xfs %dir %{_sysconfdir}/X11/fs %attr(755,root,root) %{_libdir}/X11/fs -%config(noreplace) %{_sysconfdir}/X11/fs/config -%config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XftConfig +%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config %attr(755,root,root) %{_bindir}/xfs %attr(755,root,root) %{_bindir}/fslsfonts