# - separate XFS to be standalone - is it possible without duplicated files?
#
# Conditional build:
-%bcond_without tdfx # disables tdfx drivers building
+%bcond_without glide # don't build glide driver
#
-Summary: Xorg Window System servers and basic programs
-Summary(de): Xorg Window-System-Server und grundlegende Programme
-Summary(es): Programas básicos y servidores para el sistema de ventanas Xorg
-Summary(fr): Serveurs du système Xorg et programmes de base
-Summary(ja): Xorg window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
+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(fr): Serveurs du système XOrg X11 et programmes de base
+Summary(ja): XOrg X11 window system ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à
Summary(ko): X¿¡ ÇÊ¿äÇÑ ±âº»ÀûÀÎ ±Û²Ã°ú ÇÁ·Î±×·¥°ú ¹®¼µé
-Summary(pl): Xorg Window System wraz z podstawowymi programami
-Summary(tr): Xorg Pencereleme Sistemi sunucularý ve temel programlar
-Summary(pt_BR): Programas básicos e servidores para o sistema de janelas Xorg
+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(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
-Summary(zh_CN): Xorg ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
-Name: Xorg
+Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
+Name: X11
Version: 6.7.0
-Release: 0.1
+Release: 6
Epoch: 1
License: XFree86 1.0 (?)
Group: X11/Xorg
-Source0: http://freedesktop.org/~xorg/X11R%{version}/src/X11R%{version}-src1.tar.gz
+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/X11R%{version}-src2.tar.gz
+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/X11R%{version}-src3.tar.gz
+Source2: http://freedesktop.org/~xorg/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
# Source2-md5: 4c7144786522bbce383b21ace72bf669
Source7: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
# Source7-md5: 0a15b1c374256b5cad7961807baa3896
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
-# NoSource53-md5: bf9b05a66798796b53ed1a050049b2ee
+# NoSource53-md5: a5738dcfa20119fa3e06ce479ca94acf
Patch0: %{name}-PLD.patch
Patch1: XFree86-HasZlib.patch
Patch2: XFree86-DisableDebug.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: XFree86-disable_glide.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
Patch50: %{name}-xterm-256colors.patch
Patch52: XFree86-kernel_headers.patch
Patch53: XFree86-stdint.patch
+Patch54: %{name}-setxkbmap.patch
+Patch55: %{name}-makefile-fastbuild.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} amd64 ia64
+%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
+BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-Requires: %{name}-libs = %{epoch}:%{version}
+Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: xauth
Requires: pam >= 0.77.3
-ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64
-BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Provides: XFree86 = %{epoch}:%{version}-%{release}
Obsoletes: xpm-progs
Obsoletes: xterm
+Obsoletes: XFree86
%ifarch sparc sparc64
Obsoletes: X11R6.1
%endif
-Provides: XFree86 = %{epoch}:%{version}-%{release}
+ExclusiveArch: %{ix86} alpha amd64 armv4l ia64 m68k ppc sparc
+BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
%define _soundsdir /usr/share/sounds
+%define _wallpapersdir /usr/share/wallpapers
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
-# avoid Mesa dependency in Xorg-OpenGL-libs
+# avoid Mesa dependency in X11-OpenGL-libs
# Glide3 (libglide3.so.3) can be provided by Glide_V3-DRI or Glide_V5-DRI
%define _noautoreqdep libGL.so.1 libGLU.so.1 libOSMesa.so.3.3 libglide3.so.3
application deployment--running an application on another computer
while viewing the input/output on your machine. X is a powerful
environment which supports many different applications, such as games,
-programming tools, graphics programs, text editors, etc. Xorg is
+programming tools, graphics programs, text editors, etc. XOrg X11 is
the version of X which runs on Linux, as well as other platforms.
This package contains the basic fonts, programs and documentation for
ÚÁÐÕÓË ÐÒÏÇÒÁÍÍ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ Ó ××ÏÄÏÍ/×Ù×ÏÄÏÍ ÎÁ
ÐÏÌØÚÏ×ÁÔÅÌØÓËÕÀ ÍÁÛÉÎÕ. X - ÜÔÏ ÍÏÝÎÁÑ ÓÒÅÄÁ, ÐÏÄÄÅÒÖÉ×ÁÀÝÁÑ
ÍÎÏÖÅÓÔ×Ï ÐÒÉÌÏÖÅÎÉÊ, ÔÁËÉÈ ËÁË ÉÇÒÙ, ÉÎÓÔÒÕÍÅÎÔÙ ÄÌÑ ÐÒÏÇÒÁÍÍÉÓÔÁ,
-ÇÒÁÆÉÞÅÓËÉÅ ÐÒÏÇÒÁÍÍÙ, ÔÅËÓÔÏ×ÙÅ ÒÅÄÁËÔÏÒÙ É Ô.Ð. Xorg - ÜÔÏ ×ÅÒÓÉÑ
-X, ÒÁÂÏÔÁÀÝÁÑ ÎÁ Linux É ÄÒÕÇÉÈ ÓÉÓÔÅÍÁÈ.
+ÇÒÁÆÉÞÅÓËÉÅ ÐÒÏÇÒÁÍÍÙ, ÔÅËÓÔÏ×ÙÅ ÒÅÄÁËÔÏÒÙ É Ô.Ð. XOrg X11 - ÜÔÏ
+×ÅÒÓÉÑ X, ÒÁÂÏÔÁÀÝÁÑ ÎÁ Linux É ÄÒÕÇÉÈ ÓÉÓÔÅÍÁÈ.
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ÂÁÚÏ×ÙÅ ÛÒÉÆÔÙ, ÐÒÏÇÒÁÍÍÙ É ÄÏËÕÍÅÎÔÁÃÉÀ ÄÌÑ
ÒÁÂÏÞÅÊ ÓÔÁÎÃÉÉ X.
äÏÐÏÌÎÉÔÅÌØÎÏ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÐÁËÅÔÙ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ
-xfs É ÂÉÂÌÉÏÔÅËÉ Xorg-libs. ÷ÏÚÍÏÖÎÏ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÖÅ ÏÄÉÎ
-ÉÌÉ ÂÏÌÅÅ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× Xorg.
+xfs É ÂÉÂÌÉÏÔÅËÉ X11-libs. ÷ÏÚÍÏÖÎÏ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÖÅ ÏÄÉÎ ÉÌÉ
+ÂÏÌÅÅ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XOrg X11.
îÕ É, ÎÁËÏÎÅÃ, ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÉÌÏÖÅÎÉÑ,
-ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, ×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ
-Xorg-devel.
+ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ, ×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÂÕÄÅÔ ÕÓÔÁÎÏ×ÉÔØ X11-devel.
%description -l uk
X Window System ÎÁÄÁ¤ ÂÁÚÕ ÄÌÑ ÒÏÚÒÏÂËÉ ÇÒÁƦÞÎÉÈ ¦ÎÔÅÒÆÅÊÓ¦×
ÐÒÏÇÒÁÍ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦ Ú ××ÏÄÏÍ/×É×ÏÄÏÍ ÎÁ ÍÁÛÉÎÕ
ËÏÒÉÓÔÕ×ÁÞÁ. X - ÃÅ ÐÏÔÕÖÎÅ ÓÅÒÅÄÏ×ÉÝÅ, ÑËŠЦÄÔÒÉÍÕ¤ ×ÅÌÉËÕ Ë¦ÌØ˦ÓÔØ
Ò¦ÚÎÉÈ ÐÒÏÇÒÁÍ, ÔÁËÉÈ ÑË ¦ÇÒÉ, ¦ÎÓÔÒÕÍÅÎÔÉ ÄÌÑ ÐÒÏÇÒÁͦÓÔÁ, ÇÒÁƦÞΦ
-ÐÒÏÇÒÁÍÉ, ÔÅËÓÔÏצ ÒÅÄÁËÔÏÒÉ ¦ Ô.¦. Xorg - ÃÅ ×ÅÒÓ¦Ñ X, ÑËÁ ÐÒÁÃÀ¤
+ÐÒÏÇÒÁÍÉ, ÔÅËÓÔÏצ ÒÅÄÁËÔÏÒÉ ¦ Ô.¦. XOrg X11 - ÃÅ ×ÅÒÓ¦Ñ X, ÑËÁ ÐÒÁÃÀ¤
ÎÁ Linux ÔÁ ¦ÎÛÉÈ ÓÉÓÔÅÍÁÈ.
ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÂÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ ÄÌÑ ÒÏÂÏÞϧ
ÓÔÁÎæ§ X.
äÏÄÁÔËÏ×Ï ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÐÁËÅÔÉ Xconfigurator, ÆÏÎÔÓÅÒ×ÅÒ xfs ÔÁ
-¦Â̦ÏÔÅËÉ Xorg-libs. íÏÖÌÉ×Ï ÔÁËÏÖ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÏÄÉÎ ÁÂÏ
-ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× Xorg.
+¦Â̦ÏÔÅËÉ X11-libs. íÏÖÌÉ×Ï ÔÁËÏÖ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÏÄÉÎ ÁÂÏ
+ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XOrg X11.
îÕ ¦, ÎÁÒÅÛÔ¦, ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÉËÌÁÄΦ ÐÒÏÇÒÁÍÉ, ÝÏ
-ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ ÔÁËÏÖ ÔÒÅÂÁ ÂÕÄÅ ×ÓÔÁÎÏ×ÉÔÉ Xorg-devel.
+ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ ÔÁËÏÖ ÔÒÅÂÁ ÂÕÄÅ ×ÓÔÁÎÏ×ÉÔÉ X11-devel.
%package common
-Summary: Xorg files required both on server and client side
-Summary(pl): Pliki Xorg wymagane zarówno po stronie serwera jak i klienta
+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
-Provides: XFree86-common = %{epoch}:%{version}-%{release}
+Provides: XFree86-common = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-common
%description common
-Xorg files required both on server and client side.
+XOrg X11 files required both on server and client side.
%description common -l pl
-Pliki Xorg wymagane zarówno po stronie serwera jak i klienta.
+Pliki XOrg X11 wymagane zarówno po stronie serwera jak i klienta.
%package DPS
Summary: Display PostScript
Group: X11/Xorg
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: DPS
+Provides: XFree86-DPS = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS
Obsoletes: dgs
-Provides: XFree86-DPS = %{epoch}:%{version}-%{release}
%description DPS
X-Window Display PostScript is device-independent imaging model for
Group: X11/Xorg
Requires: %{name}-DPS = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: XFree86-DPS-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-devel
Obsoletes: dgs-devel
-Provides: XFree86-DPS-devel = %{epoch}:%{version}-%{release}
%description DPS-devel
Header files for develop X-Window Display Postscript.
Summary(pl): Biblioteki statyczne Display PostScript
Group: X11/Xorg
Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release}
+Provides: XFree86-DPS-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-DPS-static
Obsoletes: dgs-static
-Provides: XFree86-DPS-static = %{epoch}:%{version}-%{release}
%description DPS-static
X-Window Display PostScript static libraries.
%package OpenGL-core
Summary: OpenGL support for X11R6
Summary(pl): Wsparcie OpenGL dla systemu X11R6
-Group: X11/Libraries
+Group: XFree86/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: Xorg-OpenGL-libGL
-Provides: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: X11-OpenGL-libGL
+Provides: XFree86-OpenGL-core = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-core
%description OpenGL-core
OpenGL support for X11R6 system.
%package OpenGL-libGL
Summary: OpenGL support for X11R6 - GL library
Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
-Group: X11/Libraries
-Requires: Xorg-OpenGL-core = %{epoch}:%{version}-%{release}
-Obsoletes: Xorg-driver-firegl
-Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Group: XFree86/Libraries
+Requires: X11-OpenGL-core = %{epoch}:%{version}-%{release}
+Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-libGL
+Obsoletes: X11-driver-firegl
+Obsoletes: X11-driver-nvidia
%description OpenGL-libGL
OpenGL support for X11R6 system - GL library.
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
Provides: OpenGL-devel
+Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-devel
Obsoletes: Mesa-devel
-Obsoletes: Xorg-OpenGL-doc
Obsoletes: glxMesa-devel
-Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
%description OpenGL-devel
Headers and man pages for OpenGL for X11R6.
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-devel-base
-Provides: XFree86-OpenGL-devel-base = %{epoch}:%{version}-%{release}
+Provides: XFree86-OpenGL-devel-base = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-devel-base
+Obsoletes: X11-driver-nvidia-devel
%description OpenGL-devel-base
Base headers (GL and GLX only) for OpenGL for X11R6.
%package OpenGL-libs
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
-Group: X11/Libraries
+Group: XFree86/Libraries
Requires: %{name}-OpenGL-core
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: OpenGL
+Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-libs
Obsoletes: Mesa
-Obsoletes: Xorg-OpenGL
-Provides: XFree86-OpenGL-libs = %{epoch}:%{version}-%{release}
%description OpenGL-libs
OpenGL libraries for X11R6 system.
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
Provides: OpenGL-static
+Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-OpenGL-static
Obsoletes: Mesa-static
-Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
%description OpenGL-static
X11R6 static libraries with OpenGL.
Biblioteki statyczne zawieraj±ce wsparcie dla OpenGL do X11R6.
%package Xnest
-Summary: Xorg Xnest server
-Summary(pl): Serwer Xorg Xnest
-Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ Xorg
-Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ Xorg
+Summary: XOrg X11 Xnest server
+Summary(pl): Serwer XOrg X11 Xnest
+Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XOrg X11
+Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XOrg X11
Group: X11/Xorg/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: Xorg-fonts-base
-Provides: XFree86-Xnest = %{epoch}:%{version}-%{release}
+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
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: Xorg-fonts-base
+Requires: X11-fonts-base
+Provides: XFree86-Xprt = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xprt
%description Xprt
Xprt provides an X server with the print extension and special DDX
Xprt jest X serwerem z rozszerzeniem Xprint.
%package Xserver
-Summary: Xorg X display server
-Summary(de): Xorg Server
-Summary(fr): Serveur Xorg
-Summary(pl): Serwer Xorg
-Summary(tr): Xorg sunucusu
+Summary: XOrg X11 X display server
+Summary(de): XOrg X11 Server
+Summary(fr): Serveur XOrg X11
+Summary(pl): Serwer XOrg X11
+Summary(tr): XOrg X11 sunucusu
Group: X11/Xorg/Servers
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: Xorg-fonts-base
+Requires: X11-fonts-base
Requires: pam
-Obsoletes: Xorg-Mono
-Obsoletes: Xorg-SVGA
-Obsoletes: Xorg-VGA16
+Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xserver
+Obsoletes: X11-Mono
+Obsoletes: X11-SVGA
+Obsoletes: X11-VGA16
# obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx
-Obsoletes: Xorg-Sun
-Obsoletes: Xorg-Sun24
+Obsoletes: X11-Sun
+Obsoletes: X11-Sun24
# still not supported in 4.2.0:
-#Obsoletes: Xorg-Mach8 Xorg-8514 Xorg-AGX Xorg-P9000
+#Obsoletes: X11-Mach8 X11-8514 X11-AGX X11-P9000
# (and many drivers from XF86_SVGA server... and some from others)
-Obsoletes: Xorg-XF86Setup
Obsoletes: Xconfigurator
-Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
%description Xserver
Generally used X server which uses display hardware. It requires
proper driver for your display hardware - package itself contains only
drivers for VGA and VESA-compliant cards (without acceleration). Other
-drivers can be found in Xorg-driver-* packages.
+drivers can be found in X11-driver-* packages.
%description Xserver -l de
X-Server für die elementarsten Framebuffer-SVGA-Geräte, einschließlich
Jest to podstawowy Xserwer 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
-Xorg-driver-*.
+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
sunucuyu deneyin.
%package Xvfb
-Summary: Xorg Xvfb server
-Summary(pl): Serwer Xorg Xvfb
-Summary(ru): óÅÒ×ÅÒ Xorg ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
-Summary(uk): óÅÒ×ÅÒ Xorg ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
+Summary: XOrg X11 Xvfb server
+Summary(pl): Serwer XOrg X11 Xvfb
+Summary(ru): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
+Summary(uk): óÅÒ×ÅÒ XOrg X11 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/Xorg/Servers
+Provides: XFree86-Xvfb = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xvfb
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/lib/X11/rgb.txt
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Requires: Xorg-fonts-base
+Requires: X11-fonts-base
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
Group: X11/Development/Libraries
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: render
+Provides: xcursor-devel
+Provides: xft-devel = 2.1.6
Provides: xpm-devel
-Obsoletes: xpm-devel
+Provides: xrender-devel = 0.8.4
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
-Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-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
Associates (X Programming) polecanych przez Red Hata.
%description devel -l ru
-Xorg-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ
-ÄÌÑ ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. Xorg-devel
-×ËÌÀÞÁÅÔ ÂÁÚÏ×ÕÀ ÂÉÂÌÉÏÔÅËÕ Xlib É ÎÁÂÏÒÙ ÐÒÉÍÉÔÉ×Ï× Xt É Xaw.
+X11-devel ×ËÌÀÞÁÅÔ ÂÉÂÌÉÏÔÅËÉ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÀ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
+ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. X11-devel ×ËÌÀÞÁÅÔ
+ÂÁÚÏ×ÕÀ ÂÉÂÌÉÏÔÅËÕ Xlib É ÎÁÂÏÒÙ ÐÒÉÍÉÔÉ×Ï× Xt É Xaw.
-õÓÔÁÎÏ×ÉÔÅ Xorg-devel ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ,
+õÓÔÁÎÏ×ÉÔÅ X11-devel ÅÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ,
ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ.
%description devel -l tr
yanýsýra Xt ve Xaw arayüz kitaplýklarýný da içerir.
%description devel -l uk
-Xorg-devel ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ, ÎÅÏÂȦÄΦ
-ÄÌÑ ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ. Xorg-devel ͦÓÔÉÔØ
-ÂÁÚÏ×Õ Â¦Â̦ÏÔÅËÕ Xlib ÔÁ ÎÁÂÏÒÉ ÐÒÉͦÔÉ×¦× Xt ÔÁ Xaw.
+X11-devel ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁæÀ, ÎÅÏÂȦÄΦ ÄÌÑ
+ÒÏÚÒÏÂËÉ ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ. X11-devel ͦÓÔÉÔØ ÂÁÚÏ×Õ
+¦Â̦ÏÔÅËÕ Xlib ÔÁ ÎÁÂÏÒÉ ÐÒÉͦÔÉ×¦× Xt ÔÁ Xaw.
-÷ÓÔÁÎÏצÔØ Xorg-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
+÷ÓÔÁÎÏצÔØ X11-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
%package Xserver-devel
-Summary: Header files for Xorg Xserver drivers/extensions development
-Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera Xorg
+Summary: Header files for XOrg X11 Xserver drivers/extensions development
+Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XOrg X11
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
-Provides: XFree86-Xserver-devel = %{epoch}:%{version}-%{release}
+Provides: XFree86-Xserver-devel = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-Xserver-devel
%description Xserver-devel
-Header files for Xorg Xserver drivers and extensions development.
+Header files for XOrg X11 Xserver drivers and extensions development.
%description Xserver-devel -l pl
-Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera
-Xorg.
+Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera XOrg
+X11.
%package driver-apm
Summary: Alliance Promotion video driver
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-apm
%description driver-apm
Alliance Promotion driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ark
%description driver-ark
Ark Logic driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-ati
%description driver-ati
ATI video driver.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-r128
%description driver-r128
ATI Rage 128 video driver.
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-radeon
%description driver-radeon
ATI Radeon video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-chips
%description driver-chips
Chips and Technologies video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-cirrus
%description driver-cirrus
Cirrus Logic video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-cyrix
%description driver-cyrix
Cyrix video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-fbdev
%description driver-fbdev
Non-accelerated video driver for framebuffer device.
Group: X11/Xorg
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.
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
# dlopens libglide2x.so
Requires: Glide_VG
+Obsoletes: XFree86-driver-glide
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-glint
%description driver-glint
GLINT/Permedia video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-i128
%description driver-i128
Number 9 I128 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-i740
%description driver-i740
Intel i740 video driver.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-i810
%description driver-i810
Intel i810/i815/i830 video driver.
Group: X11/Xorg
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.
Requires: OpenGL
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-mga
%description driver-mga
Matrox video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-neomagic
%description driver-neomagic
NeoMagic video driver.
Group: X11/Xorg
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
Group: X11/Xorg
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
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-nv
%description driver-nv
nVidia video driver. Supports Riva128, RivaTNT, GeForce.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-rendition
%description driver-rendition
Rendition/Micron video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-s3virge
%description driver-s3virge
S3 ViRGE/Trio3D video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-s3
%description driver-s3
S3 Trio video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-savage
%description driver-savage
S3 Savage video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-siliconmotion
%description driver-siliconmotion
Silicon Motion video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sis
%description driver-sis
SiS video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-sunbw2
%description driver-sunbw2
sunbw2 - Sun BW2 video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-suncg14
%description driver-suncg14
suncg14 - Sun CG14 video driver.
Group: X11/Xorg
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.
Group: X11/Xorg
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.
Group: X11/Xorg
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.
Group: X11/Xorg
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.
Group: X11/Xorg
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.
# dlopens libglide3x.so
Requires: Glide3-DRI
Requires: OpenGL
-Conflicts: Xorg-driver-nvidia
+Conflicts: X11-driver-nvidia
+Obsoletes: XFree86-driver-tdfx
%description driver-tdfx
3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-tga
%description driver-tga
TGA video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-trident
%description driver-trident
Trident video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-tseng
%description driver-tseng
Tseng Labs video driver.
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-via
%description driver-via
VIA CLE266 driver.
Group: X11/Xorg
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
Requires(post,postun): grep
Requires(postun): fileutils
Requires: %{name}-common = %{epoch}:%{version}-%{release}
+Provides: XFree86-libs = %{epoch}:%{version}-%{release}
+Provides: xcursor
+Provides: xft
Provides: xpm
-Obsoletes: xpm
+Provides: xrender
+Obsoletes: XFree86-libs
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
%endif
-Provides: XFree86-libs = %{epoch}:%{version}-%{release}
+Obsoletes: xcursor
+Obsoletes: xft
+Obsoletes: xpm
+Obsoletes: xrender
%description libs
-Xorg-libs contains the shared libraries that most X programs need
-to run properly. These shared libraries are in a separate package in
+X11-libs contains the shared libraries that most X programs need to
+run properly. These shared libraries are in a separate package in
order to reduce the disk space needed to run X applications on a
machine without an X server (i.e, over a network).
If you are installing the X Window System on your machine, you will
-need to install Xorg-libs. You will also need to install the
-Xorg package, Xorg-Xserver, one of the Xorg-driver-*,
-Xorg-fonts, Xorg-fonts-ISO8859-1, optionally some of the other
-fonts (choose 75dpi or 100dpi depending upon your monitor's
-resolution), the Xorg-setup and the Xorg-tools. And, finally, if
-you are going to be developing applications that run as X clients, you
-will also need to install Xorg-devel.
+need to install X11-libs. You will also need to install the X11
+package, X11-Xserver, one of the X11-driver-*, X11-fonts,
+X11-fonts-ISO8859-1, optionally some of the other fonts (choose 75dpi
+or 100dpi depending upon your monitor's resolution), the X11-setup and
+the X11-tools. And, finally, if you are going to be developing
+applications that run as X clients, you will also need to install
+X11-devel.
%description libs -l de
Dieses Paket enthält die zur gemeinsamen Nutzung vorgesehenen
olarak sunulmuþtur.
%description libs -l ru
-Xorg-libs ÓÏÄÅÒÖÉÔ ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÙ ÄÌÑ
+X11-libs ÓÏÄÅÒÖÉÔ ÒÁÚÄÅÌÑÅÍÙÅ ÂÉÂÌÉÏÔÅËÉ, ËÏÔÏÒÙÅ ÎÅÏÂÈÏÄÉÍÙ ÄÌÑ
ÒÁÂÏÔÙ ÂÏÌØÛÉÎÓÔ×Õ ÐÒÏÇÒÁÍÍ ÄÌÑ X. üÔÉ ÂÉÂÌÉÏÔÅËÉ ×ÙÎÅÓÅÎÙ × ÏÔÄÅÌØÎÙÊ
ÐÁËÅÔ ÞÔÏÂÙ ÓÜËÏÎÏÍÉÔØ ÄÉÓËÏ×ÏÅ ÐÒÏÓÔÒÁÎÓÔ×Ï, ÎÅÏÂÈÏÄÉÍÏÅ ÄÌÑ ÚÁÐÕÓËÁ
ÐÒÉÌÏÖÅÎÉÊ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÁ (ÎÁÐÒÉÍÅÒ, ÐÏ ÓÅÔÉ).
åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System ÎÁ ×ÁÛÅÊ ÍÁÛÉÎÅ, ×ÁÍ ÎÅÏÂÈÏÄÉÍÏ
-ÕÓÔÁÎÏ×ÉÔØ Xorg-libs. ôÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:
-Xorg, ÏÄÉÎ ÉÌÉ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× Xorg, Xconfigurator,
-Xorg-xfs.
+ÕÓÔÁÎÏ×ÉÔØ X11-libs. ôÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ:
+XOrg X11, ÏÄÉÎ ÉÌÉ ÎÅÓËÏÌØËÏ ÐÁËÅÔÏ× ÛÒÉÆÔÏ× XOrg X11, Xconfigurator,
+X11-xfs.
åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ,
-×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ Xorg-devel.
+×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ X11-devel.
%description libs -l uk
-Xorg-libs ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ, ËÏÔÒ¦
-ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÂÏÔÉ Â¦ÌØÛÏÓÔ¦ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ ÄÌÑ X. 㦠¦Â̦ÏÔÅËÉ
-×ÉÎÅÓÅΦ × ÏËÒÅÍÉÊ ÐÁËÅÔ ÄÌÑ ÅËÏÎÏͦ§ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÏÒÕ, ÎÅÏÂȦÄÎÏÇÏ
-ÄÌÑ ÚÁÐÕÓËÕ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÕ (ÎÁÐÒÉËÌÁÄ,
-ÐÏ ÍÅÒÅÖ¦).
+X11-libs ͦÓÔÉÔØ Â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ, ËÏÔÒ¦ ÎÅÏÂȦÄΦ
+ÄÌÑ ÒÏÂÏÔÉ Â¦ÌØÛÏÓÔ¦ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ ÄÌÑ X. 㦠¦Â̦ÏÔÅËÉ ×ÉÎÅÓÅΦ
+× ÏËÒÅÍÉÊ ÐÁËÅÔ ÄÌÑ ÅËÏÎÏͦ§ ÄÉÓËÏ×ÏÇÏ ÐÒÏÓÔÏÒÕ, ÎÅÏÂȦÄÎÏÇÏ ÄÌÑ
+ÚÁÐÕÓËÕ ÐÒÉËÌÁÄÎÉÈ ÐÒÏÇÒÁÍ X ÎÁ ÍÁÛÉÎÁÈ ÂÅÚ X-ÓÅÒ×ÅÒÕ (ÎÁÐÒÉËÌÁÄ, ÐÏ
+ÍÅÒÅÖ¦).
ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System ÎÁ ×ÁÛ¦Ê ÍÁÛÉΦ, ×ÁÍ ÎÅÏÂȦÄÎÏ
-×ÓÔÁÎÏ×ÉÔÉ Xorg-libs. ôÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ:
-Xorg, ÏÄÉÎ ÁÂÏ ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× Xorg, Xconfigurator,
-Xorg-xfs.
+×ÓÔÁÎÏ×ÉÔÉ X11-libs. ôÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: XOrg X11,
+ÏÄÉÎ ÁÂÏ ÄÅ˦ÌØËÁ ÐÁËÅÔ¦× ÛÒÉÆÔ¦× XOrg X11, Xconfigurator, X11-xfs.
ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ
-ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ Xorg-devel.
+ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ X11-devel.
%package modules
Summary: Modules with X servers extensions
Summary(pl): Wspólne dla wszystkich X serwerów modu³y rozszerzeñ
Group: X11/Xorg
+Provides: XFree86-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-modules
%description modules
Modules with X servers extensions.
Wspólne dla wszystkich X serwerów modu³y rozszerzeñ.
%package setup
-Summary: Graphical configuration tool for Xorg
-Summary(pl): Graficzny konfigurator dla Xorg
-Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ Xorg
-Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ Xorg
+Summary: Graphical configuration tool for XOrg X11
+Summary(pl): Graficzny konfigurator dla XOrg X11
+Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XOrg X11
+Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XOrg X11
Group: X11/Xorg
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes: Xorg-xf86cfg
+Provides: XFree86-setup = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-setup
+Obsoletes: X11-xf86cfg
%description setup
-Setup containst a configuration tool for the Xorg family of
+Setup containst a configuration tool for the XOrg X11 family of
servers. It allows you to configure video settings, keyboard layouts,
mouse type, and other miscellaneous options. It is slow however, and
requires the generic VGA 16 color server be available.
%description setup -l pl
-Pakiet setup zawiera narzêdzia do konfiguracji Xorg. Pozwala na
+Pakiet setup zawiera narzêdzia do konfiguracji XOrg X11. Pozwala na
skonfigurowanie ustawieñ obrazu, klawiatury, typu myszki i innych
ró¿nych rzeczy. Jednak¿e jest wolny i wymaga dostêpno¶ci serwera do
standardowej 16-kolorowej VGA.
%description setup -l ru
-õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ Xorg.
+õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XOrg X11.
%description setup -l uk
-õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ Xorg.
+õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XOrg X11.
%package static
Summary: X11R6 static libraries
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
Group: X11/Development/Libraries
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
+Provides: XFree86-static = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-static
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
+Obsoletes: xcursor-static
+Obsoletes: xft-static
Obsoletes: xpm-static
-Provides: XFree86-static = %{epoch}:%{version}-%{release}
+Obsoletes: xrender-static
%description static
X11R6 static libraries.
Biblioteki statyczne X11R6.
%description static -l ru
-Xorg-static ×ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ
-ÒÁÚÒÁÂÏÔËÉ ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. ÓÏÂÒÁÎÎÙÅ ÐÒÏÇÒÁÍÍÙ,
-ËÏÔÏÒÙÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ.
+X11-static ×ËÌÀÞÁÅÔ ÓÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ÒÁÚÒÁÂÏÔËÉ
+ÐÒÏÇÒÁÍÍ, ÒÁÂÏÔÁÀÝÉÈ ËÁË X-ËÌÉÅÎÔÙ. ÓÏÂÒÁÎÎÙÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ ÂÕÄÕÔ
+ÒÁÂÏÔÁÔØ ËÁË X-ËÌÉÅÎÔÙ.
%description static -l uk
-Xorg-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ
+X11-static ͦÓÔÉÔØ ÓÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ, ÎÅÏÂȦÄΦ ÄÌÑ ÒÏÚÒÏÂËÉ
ÐÒÏÇÒÁÍ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ.
%package tools
-Summary: Various tools for Xorg
-Summary(pl): Ró¿ne narzêdzia dla Xorg
-Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ Xorg
-Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ Xorg
+Summary: Various tools for XOrg X11
+Summary(pl): Ró¿ne narzêdzia dla XOrg X11
+Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XOrg X11
+Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XOrg X11
Group: X11/Xorg
Requires: %{name} = %{epoch}:%{version}-%{release}
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: man-config
+Provides: XFree86-tools = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-tools
Obsoletes: X11R6-contrib
-Provides: XFree86-tools = %{epoch}:%{version}-%{release}
%description tools
Various tools for X, including listres, xbiff, xedit, xeyes, xcalc,
xload and xman, among others.
-If you're using X, you should install Xorg-tools. You will also
-need to install the Xorg package, the Xorg package which
-corresponds to your video card, some of the Xorg fonts packages,
-the Xorg-setup package and the Xorg-libs package.
+If you're using X, you should install X11-tools. You will also need to
+install the XOrg X11 package, the XOrg X11 package which corresponds
+to your video card, some of the XOrg X11 fonts packages, the X11-setup
+package and the X11-libs package.
Finally, if you are going to develop applications that run as X
-clients, you will also need to install Xorg-devel.
+clients, you will also need to install X11-devel.
This package contains all applications that used to be in
X11R6-contrib in older releases.
Ró¿ne narzêdzia dla X, w tym listres, xbiff, xedit, xeyes, xcalc,
xload, xman i inne.
-Je¶li u¿ywasz Xów powiniene¶ zainstalowaæ Xorg-tools. Bêdziesz
-równie¿ musia³ zainstalowaæ pakiet Xorg, pakiet odpowiadaj±cy
-Twojej karcie graficznej, jeden z pakietów z fontami, pakiet
-Xconfigurator oraz Xorg-libs.
+Je¶li u¿ywasz Xów powiniene¶ zainstalowaæ X11-tools. Bêdziesz równie¿
+musia³ zainstalowaæ pakiet XOrg X11, pakiet odpowiadaj±cy Twojej
+karcie graficznej, jeden z pakietów z fontami, pakiet Xconfigurator
+oraz X11-libs.
Wreszcie, je¶li zamierzasz tworzyæ aplikacje, które dzia³aj± jako
-klienci X, bêdziesz musia³ zainstalowaæ równie¿ Xorg-devel.
+klienci X, bêdziesz musia³ zainstalowaæ równie¿ X11-devel.
Ten pakiet zawiera aplikacje, które by³y w X11R6-contrib w starszych
wersjach X.
òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ X, ×ËÌÀÞÁÑ listres, xbiff, xedit, xeyes,
xcalc, xload, xman É ÄÒÕÇÉÅ.
-åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System, ×ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ
-Xorg-tools. ôÁËÖÅ ×ÁÍ ÔÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÉÅ ÐÁËÅÔÙ:
-Xorg, Xconfigurator, Xorg-xfs É Xorg-libs. ÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÁÄÏ
-ÕÓÔÁÎÏ×ÉÔØ É ÄÒÕÇÉÅ ÐÁËÅÔÙ ÛÒÉÆÔÏ× Xorg.
+åÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System, ×ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ X11-tools.
+ôÁËÖÅ ×ÁÍ ÔÁËÖÅ ÎÅÏÂÈÏÄÉÍÏ ÕÓÔÁÎÏ×ÉÔØ ÔÁËÉÅ ÐÁËÅÔÙ: XOrg X11,
+Xconfigurator, X11-xfs É X11-libs. ÷ÏÚÍÏÖÎÏ, ×ÁÍ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ É
+ÄÒÕÇÉÅ ÐÁËÅÔÙ ÛÒÉÆÔÏ× XOrg X11.
åÓÌÉ ×Ù ÓÏÂÉÒÁÅÔÅÓØ ÒÁÚÒÁÂÁÔÙ×ÁÔØ ÐÒÏÇÒÁÍÍÙ, ÒÁÂÏÔÁÀÝÉÅ ËÁË X-ËÌÉÅÎÔÙ,
-×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ Xorg-devel.
+×ÁÍ ÔÁËÖÅ ÎÁÄÏ ÕÓÔÁÎÏ×ÉÔØ X11-devel.
üÔÏÔ ÐÁËÅÔ ÓÏÄÅÒÖÉÔ ×ÓÅ ÐÒÏÇÒÁÍÍÙ, ËÏÔÏÒÙÅ ÒÁÎØÛÅ ×ËÌÀÞÁÌÉÓØ ×
X11R6-contrib.
xcalc, xload, xman ÔÁ ¦ÎÛ¦.
ñËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System, ×ÁÍ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ
-Xorg-tools. ôÁËÏÖ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: Xorg,
-Xconfigurator, Xorg-xfs ÔÁ Xorg-libs. íÏÖÌÉ×Ï, ×ÁÍ ÔÒÅÂÁ
-×ÓÔÁÎÏ×ÉÔÉ Ê ¦ÎÛ¦ ÐÁËÅÔÉ ÛÒÉÆÔ¦× Xorg.
+X11-tools. ôÁËÏÖ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ ÔÁ˦ ÐÁËÅÔÉ: XOrg X11,
+Xconfigurator, X11-xfs ÔÁ X11-libs. íÏÖÌÉ×Ï, ×ÁÍ ÔÒÅÂÁ ×ÓÔÁÎÏ×ÉÔÉ Ê
+¦ÎÛ¦ ÐÁËÅÔÉ ÛÒÉÆÔ¦× XOrg X11.
ñËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦ ÐÒÁÃÀÀÔØ ÑË X-Ë̦¤ÎÔÉ, ×ÁÍ
-ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ Xorg-devel.
+ÔÁËÏÖ ÎÅÏÂȦÄÎÏ ×ÓÔÁÎÏ×ÉÔÉ X11-devel.
ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib.
Summary: Cursors Theme "handhelds"
Summary(pl): Motyw kursorów "handhelds"
Group: X11/Themes
-Requires: Xorg-libs
-Requires: xcursor
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-handhelds
Cursors theme "handhelds" for X11.
Summary: Cursors theme "redglass"
Summary(pl): Motyw kursorów "redglass"
Group: X11/Themes
-Requires: Xorg-libs
-Requires: xcursor
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-redglass
Cursors theme "redglass" for X11.
Summary: Cursors theme "whiteglass"
Summary(pl): Motyw kursorów "whiteglass"
Group: X11/Themes
-Requires: Xorg-libs
-Requires: xcursor
+#Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: XFree86-libs
%description -n XcursorTheme-whiteglass
Cursors theme "whiteglass" for X11.
Summary: C preprocessor interface to the make utility
Summary(pl): Miedzymordzie do make oparte o preprocesor C
Group: Development/Building
-Provides: imake = %{epoch}:%{version}-%{release}
+Provides: imake = %{epoch}:%{version}-%{release}
+Obsoletes: imake
%description imake
Imake is used to generate Makefiles from a template, a set of cpp
Summary: sessreg - manage utmp/wtmp entries for non-init clients
Summary(pl): Program do zarz±dzania wpisami w utmp/wtmp
Group: X11/Xorg
-Provides: sessreg = %{epoch}:%{version}-%{release}
+Provides: sessreg = %{epoch}:%{version}-%{release}
+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: twm
%description twm
Twm is a window manager for the X Window System. It provides
Summary(pl): xauth - narzêdzie do plików X authority
Group: X11/Xorg
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Provides: xauth = %{epoch}:%{version}-%{release}
+Provides: xauth = %{epoch}:%{version}-%{release}
+Obsoletes: xauth
%description xauth
The xauth program is used to edit and display the authorization
Requires: sessreg = %{epoch}:%{version}-%{release}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
+Provides: xdm = %{epoch}:%{version}-%{release}
+Obsoletes: xdm
Obsoletes: gdm
-Provides: xdm = %{epoch}:%{version}-%{release}
%description xdm
Xdm manages a collection of X displays, which may be on the local host
íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X.
%package xfs
-Summary: Font server for Xorg
-Summary(pl): Serwer fontów dla Xorg
+Summary: Font server for XOrg X11
+Summary(pl): Serwer fontów dla XOrg X11
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Group: X11/Xorg
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
-Requires: Xorg-fonts-base
+Requires: X11-fonts-base
+Provides: xfs = %{epoch}:%{version}-%{release}
+Obsoletes: xfs
Obsoletes: xfsft
-Provides: xfs = %{epoch}:%{version}-%{release}
%description xfs
-This is a font server for Xorg. You can serve fonts to other X
+This is a font server for XOrg X11. You can serve fonts to other X
servers remotely with this package, and the remote system will be able
to use all fonts installed on the font server, even if they are not
installed on the remote computer.
%description xfs -l pl
-Pakiet zawiera serwer fontów dla Xorg. Mo¿e udostêpniaæ fonty dla X
-serwerów lokalnych lub zdalnych.
+Pakiet zawiera serwer fontów dla XOrg X11. Mo¿e udostêpniaæ fonty dla
+X serwerów lokalnych lub zdalnych.
%description xfs -l ru
-Xorg-xfs ÓÏÄÅÒÖÉÔ ÓÅÒ×ÅÒ ÛÒÉÆÔÏ× ÄÌÑ Xorg. Xfs ÔÁËÖÅ ÍÏÖÅÔ
+X11-xfs ÓÏÄÅÒÖÉÔ ÓÅÒ×ÅÒ ÛÒÉÆÔÏ× ÄÌÑ XOrg X11. Xfs ÔÁËÖÅ ÍÏÖÅÔ
ÐÒÅÄÏÓÔÁ×ÌÑÔØ ÛÒÉÆÔÙ ÕÄÁÌÅÎÎÙÍ X-ÓÅÒ×ÅÒÁÍ. õÄÁÌÅÎÎÁÑ ÓÉÓÔÅÍÁ ÂÕÄÅÔ
ÓÐÏÓÏÂÎÁ ÉÓÐÏÌØÚÏ×ÁÔØ ×ÓÅ ÛÒÉÆÔÙ, ÕÓÔÁÎÏ×ÌÅÎÎÙÅ ÎÁ ÓÅÒ×ÅÒÅ ÛÒÉÆÔÏ×,
ÄÁÖÅ ÅÓÌÉ ÏÎÉ ÎÅ ÕÓÔÁÎÏ×ÌÅÎÙ ÎÁ ÕÄÁÌÅÎÎÏÍ ËÏÍÐØÀÔÅÒÅ.
-÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ Xorg-xfs ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window
-System. ôÁËÖÅ ×ÁÍ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ: Xorg,
-ÐÁËÅÔ(Ù) ÛÒÉÆÔÏ× Xorg, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ, Xconfigurator
-É Xorg-libs.
+÷Ù ÄÏÌÖÎÙ ÕÓÔÁÎÏ×ÉÔØ X11-xfs ÅÓÌÉ ×Ù ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÅ X Window System.
+ôÁËÖÅ ×ÁÍ ÐÒÉÄÅÔÓÑ ÕÓÔÁÎÏ×ÉÔØ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ: XOrg X11, ÐÁËÅÔ(Ù)
+ÛÒÉÆÔÏ× XOrg X11, ÎÅÏÂÈÏÄÉÍÙÅ ÄÌÑ ×ÁÛÅÊ ÓÉÓÔÅÍÙ, Xconfigurator É
+X11-libs.
%description xfs -l uk
-Xorg-xfs ͦÓÔÉÔØ ÓÅÒ×ÅÒ ÛÒÉÆÔ¦× ÄÌÑ Xorg. Xfs ÔÁËÏÖ ÍÏÖÅ
-ÎÁÄÁ×ÁÔÉ ÛÒÉÆÔÉ ×¦ÄÄÁÌÅÎÉÍ X-ÓÅÒ×ÅÒÁÍ. ÷¦ÄÄÁÌÅÎÁ ÓÉÓÔÅÍÁ ÚÍÏÖÅ
-×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ ÕÓ¦ ÛÒÉÆÔÉ, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ÓÅÒ×ÅÒ¦ ÛÒÉÆÔ¦×, ÎÁצÔØ
-ÑËÝÏ ×ÏÎÉ ÎÅ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦.
-
-÷É ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ Xorg-xfs ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window
-System. ôÁËÏÖ ×ÁÍ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÎÁÓÔÕÐΦ ÐÁËÅÔÉ: Xorg,
-ÐÁËÅÔ(É) ÛÒÉÆÔ¦× Xorg, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator
-ÔÁ Xorg-libs.
+X11-xfs ͦÓÔÉÔØ ÓÅÒ×ÅÒ ÛÒÉÆÔ¦× ÄÌÑ XOrg X11. Xfs ÔÁËÏÖ ÍÏÖÅ ÎÁÄÁ×ÁÔÉ
+ÛÒÉÆÔÉ ×¦ÄÄÁÌÅÎÉÍ X-ÓÅÒ×ÅÒÁÍ. ÷¦ÄÄÁÌÅÎÁ ÓÉÓÔÅÍÁ ÚÍÏÖÅ ×ÉËÏÒÉÓÔÏ×Õ×ÁÔÉ
+ÕÓ¦ ÛÒÉÆÔÉ, Ñ˦ ×ÓÔÁÎÏ×ÌÅΦ ÎÁ ÓÅÒ×ÅÒ¦ ÛÒÉÆÔ¦×, ÎÁצÔØ ÑËÝÏ ×ÏÎÉ ÎÅ
+×ÓÔÁÎÏ×ÌÅΦ ÎÁ צÄÄÁÌÅÎÏÍÕ ËÏÍÐ'ÀÔÅÒ¦.
-#--- %prep ---------------------------
+÷É ÐÏ×ÉÎΦ ×ÓÔÁÎÏ×ÉÔÉ X11-xfs ÑËÝÏ ×É ×ÓÔÁÎÏ×ÌÀ¤ÔÅ X Window System.
+ôÁËÏÖ ×ÁÍ ÐÒÉÊÄÅÔØÓÑ ×ÓÔÁÎÏ×ÉÔÉ ÎÁÓÔÕÐΦ ÐÁËÅÔÉ: XOrg X11, ÐÁËÅÔ(É)
+ÛÒÉÆÔ¦× XOrg X11, ÎÅÏÂȦÄΦ ÄÌÑ ×ÁÛϧ ÓÉÓÔÅÍÉ, Xconfigurator ÔÁ
+X11-libs.
%prep
%setup -qc -a1 -a2 -a7
%patch33 -p1
#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
-%{?with_tdfx:%patch36 -p0}
+%patch36 -p0
#%patch38 -p0 -- causing problems IIRC (but not really needed)
-%{?with_tdfx:%patch39 -p0}
+%patch39 -p0
%patch40 -p1
%{!?debug:%patch41 -p1}
-%{!?with_tdfx:%patch42 -p0}
+%{!?with_glide:%patch42 -p0}
%patch43 -p0
%patch44 -p0
%patch45 -p1
%patch50 -p0
%patch52 -p1
%patch53 -p0
+%patch54 -p1
+%patch55 -p0
rm -f xc/config/cf/host.def
%build
%{__make} -S -C xc World \
+ FAST=1 \
DEFAULT_OS_CPU_FROB=%{_target_cpu} \
CC="%{__cc}" \
BOOTSTRAPCFLAGS="%{rpmcflags}" \
$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{%{_xsessdir},%{_wallpapersdir}} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
%{__make} -C xc install install.man \
# according to OpenGL ABI for Linux v1.0
# (http://oss.sgi.com/projects/ogl-sample/ABI/index.html)
# libGL.so.1, libGL.so, libGLU.so.1, libGL.so must be accessible in /usr
-# libGL is already linked by Xorg build, but libGLU not
+# libGL is already linked by XOrg X11 build, but libGLU not
ln -sf %{_libdir}/libGLU.so.1 $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so.1
ln -sf %{_libdir}/libGLU.so $RPM_BUILD_ROOT/usr/%{_lib}/libGLU.so
gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
%endif
-# kill some stuff for cleaner build
-# (packaged separately, DRM already in kernel)
-rm -rf $RPM_BUILD_ROOT%{_pkgconfigdir}/{xcursor,xft}.pc \
- $RPM_BUILD_ROOT%{_libdir}/pkgconfig/fontconfig.pc \
- $RPM_BUILD_ROOT%{_mandir}/{man3/fontconfig.3x,man1/fc-{cache,list}.1x} \
- $RPM_BUILD_ROOT%{_libdir}/{libfontconfig.*,libXrender.*,libXcursor.*,libXft.{a,so.2*}} \
- $RPM_BUILD_ROOT%{_includedir}/{fontconfig,X11/{Xcursor,Xft}} \
- $RPM_BUILD_ROOT%{_bindir}/{fc-cache,fc-list,xcursor-config,xft-config} \
- $RPM_BUILD_ROOT/etc/fonts \
- $RPM_BUILD_ROOT%{_prefix}/src
-
-# skipped from removal - %%exclude is used for these
-# %{_includedir}/X11/extensions/{Xrender.h,render.h,renderproto.h}
-# %{_mandir}/man3/Xft.3x
-
%clean
rm -rf $RPM_BUILD_ROOT
rm -rf /etc/X11/xkb/geometry/hp
fi
-%triggerpostun modules -- Xorg-modules < 4.0.2
+%triggerpostun modules -- X11-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
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%{_mandir}/man1/atobm.1*
-%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man1/bitmap.1*
%{_mandir}/man1/bmtoa.1*
%{_mandir}/man1/cxpm.1*
%attr(755,root,root) %{_libdir}/libdps.so.*.*
%attr(755,root,root) %{_libdir}/libdpstk.so.*.*
%attr(755,root,root) %{_libdir}/libpsres.so.*.*
-%{_mandir}/man1/makepsres*
-%{_mandir}/man1/pswrap*
-%{_mandir}/man1/dpsexec*
-%{_mandir}/man1/dpsinfo*
+%{_mandir}/man1/makepsres.1*
+%{_mandir}/man1/pswrap.1*
+%{_mandir}/man1/dpsexec.1*
+%{_mandir}/man1/dpsinfo.1*
%files DPS-devel
%defattr(644,root,root,755)
# Linux OpenGL ABI compatibility symlink
%attr(755,root,root) /usr/%{_lib}/libGLU.so.1
%{_mandir}/man1/glxinfo.1*
-%{_mandir}/man1/glxgears.1x*
+%{_mandir}/man1/glxgears.1*
%files OpenGL-static
%defattr(644,root,root,755)
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
+%ifnarch ppc sparc sparc64 sparcv9
+%attr(755,root,root) %{_bindir}/ioport
+%endif
+%attr(755,root,root) %{_bindir}/mmapr
+%attr(755,root,root) %{_bindir}/mmapw
+%attr(755,root,root) %{_bindir}/xcursor-config
+%attr(755,root,root) %{_bindir}/xft-config
%attr(755,root,root) %{_libdir}/libFS.so
%attr(755,root,root) %{_libdir}/libI810XvMC.so
%attr(755,root,root) %{_libdir}/libICE.so
%attr(755,root,root) %{_libdir}/libXRes.so
%attr(755,root,root) %{_libdir}/libXTrap.so
%attr(755,root,root) %{_libdir}/libXaw.so
+%attr(755,root,root) %{_libdir}/libXcursor.so
%attr(755,root,root) %{_libdir}/libXext.so
%attr(755,root,root) %{_libdir}/libXfont.so
%attr(755,root,root) %{_libdir}/libXfontcache.so
+%attr(755,root,root) %{_libdir}/libXft.so
%attr(755,root,root) %{_libdir}/libXi.so
%attr(755,root,root) %{_libdir}/libXinerama.so
%attr(755,root,root) %{_libdir}/libXmu.so
%attr(755,root,root) %{_libdir}/libXp.so
%attr(755,root,root) %{_libdir}/libXpm.so
%attr(755,root,root) %{_libdir}/libXrandr.so
+%attr(755,root,root) %{_libdir}/libXrender.so
%attr(755,root,root) %{_libdir}/libXss.so
%attr(755,root,root) %{_libdir}/libXt.so
%attr(755,root,root) %{_libdir}/libXtst.so
%{_includedir}/X11/PM
%{_includedir}/X11/SM
%{_includedir}/X11/Xaw
+%{_includedir}/X11/Xcursor
+%{_includedir}/X11/Xft
%{_includedir}/X11/Xmu
%dir %{_includedir}/X11/extensions
%{_includedir}/X11/extensions/*.h
%{_includedir}/X11/fonts
%{_includedir}/xf86*.h
%{_libx11dir}/config
-
-%exclude %{_includedir}/X11/extensions/Xrender.h
-%exclude %{_includedir}/X11/extensions/render.h
-%exclude %{_includedir}/X11/extensions/renderproto.h
-
+%{_mandir}/man1/bdftopcf.1*
%{_mandir}/man3/[A-FH-Z]*
-%exclude %{_mandir}/man3/Xft.3*
+%{_pkgconfigdir}/xcursor.pc
+%{_pkgconfigdir}/xft.pc
%files Xserver-devel
%defattr(644,root,root,755)
%{_includedir}/X11/Xserver
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
-%{_mandir}/man4/apm*
+%{_mandir}/man4/apm.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
-%{_mandir}/man4/chips*
+%{_mandir}/man4/chips.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
-%{_mandir}/man4/cirrus*
+%{_mandir}/man4/cirrus.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
-%{_mandir}/man4/cyrix*
+%{_mandir}/man4/cyrix.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
%{_mandir}/man4/fbdev.4*
%endif
-%ifarch %{ix86}
-%if %{with tdfx}
+%ifarch %{ix86} ia64
+%if %{with glide}
%files driver-glide
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
-%{_mandir}/man4/glide*
+%{_mandir}/man4/glide.4*
%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 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 amd64
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
-%{_mandir}/man4/i128*
+%{_mandir}/man4/i128.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i740
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
-%{_mandir}/man4/i740*
+%{_mandir}/man4/i740.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
+# i810_dri alone is built on amd64 - what for?
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/i830_dri.so
-%{_mandir}/man4/i810*
+%{_mandir}/man4/i810.4*
%endif
# Devel: %{ix86} sparc sparc64 ppc amd64
%{_mandir}/man4/imstt.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha ppc arm
%files driver-mga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 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 amd64
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
-%{_mandir}/man4/neomagic*
+%{_mandir}/man4/neomagic.4*
%endif
# Devel: %{ix86} sparc sparc64 amd64
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha arm ppc amd64
+%ifarch %{ix86} ia64 amd64 mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
-%{_mandir}/man4/nv*
+%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
-%{_mandir}/man4/r128*
+%{_mandir}/man4/r128.4*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifarch %{ix86} alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
%endif
-%{_mandir}/man4/radeon*
+%{_mandir}/man4/radeon.4*
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%{_libdir}/modules/*.uc
-%{_mandir}/man4/rendition*
+%{_mandir}/man4/rendition.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-s3virge
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
-%{_mandir}/man4/s3virge*
+%{_mandir}/man4/s3virge.4*
%endif
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips alpha ppc arm
%files driver-savage
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
-%{_mandir}/man4/savage*
+%{_mandir}/man4/savage.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
-%{_mandir}/man4/siliconmotion*
+%{_mandir}/man4/siliconmotion.4*
%endif
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-sis
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
-%{_mandir}/man4/sis*
+%{_mandir}/man4/sis.4*
%endif
%ifarch sparc sparc64
%files driver-sunbw2
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
-%{_mandir}/man4/sunbw2*
+%{_mandir}/man4/sunbw2.4*
%endif
%ifarch sparc sparc64
%files driver-suncg14
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
-%{_mandir}/man4/suncg14*
+%{_mandir}/man4/suncg14.4*
%endif
%ifarch sparc sparc64
%files driver-suncg3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
-%{_mandir}/man4/suncg3*
+%{_mandir}/man4/suncg3.4*
%endif
%ifarch sparc sparc64
%files driver-suncg6
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
-%{_mandir}/man4/suncg6*
+%{_mandir}/man4/suncg6.4*
%endif
%ifarch sparc sparc64
%files driver-sunffb
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+# Devel: %{ix86} ia64 (for fun?)
%attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
-%{_mandir}/man4/sunffb*
+%{_mandir}/man4/sunffb.4*
%endif
%ifarch sparc sparc64
%files driver-sunleo
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
-%{_mandir}/man4/sunleo*
+%{_mandir}/man4/sunleo.4*
%endif
%ifarch sparc sparc64
%files driver-suntcx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
-%{_mandir}/man4/suntcx*
+%{_mandir}/man4/suntcx.4*
%endif
-%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64
-%if %{with tdfx}
+%ifarch %{ix86} ia64 amd64 sparc sparc64 mips alpha arm ppc
%files driver-tdfx
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
-%ifarch %{ix86} alpha arm ppc
+%ifarch %{ix86} ia64 alpha arm ppc
%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
%endif
-%{_mandir}/man4/tdfx*
-%endif
+%{_mandir}/man4/tdfx.4*
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} alpha amd64
+%ifarch %{ix86} ia64 amd64 alpha
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86} mips ppc arm amd64
+%ifarch %{ix86} ia64 amd64 mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
-%{_mandir}/man4/trident*
+%{_mandir}/man4/trident.4*
%endif
-%ifarch %{ix86} amd64
+%ifarch %{ix86} ia64 amd64
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
-%{_mandir}/man4/tseng*
+%{_mandir}/man4/tseng.4*
%endif
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-via
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
%endif
# Devel: sparc sparc64
-%ifarch %{ix86}
+%ifarch %{ix86} ia64
%files driver-vmware
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
-%{_mandir}/man4/vmware*
+%{_mandir}/man4/vmware.4*
%endif
%files libs
%defattr(644,root,root,755)
-%dir /etc/xdg
+%dir %{_sysconfdir}/xdg
%dir %{_themesdir}
%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
%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}
%attr(755,root,root) %{_libdir}/libFS.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}/libXext.so.*.*
%attr(755,root,root) %{_libdir}/libXfont.so.*.*
%attr(755,root,root) %{_libdir}/libXfontcache.so.*.*
+%attr(755,root,root) %{_libdir}/libXft.so.*.*
%attr(755,root,root) %{_libdir}/libXi.so.*.*
%attr(755,root,root) %{_libdir}/libXinerama.so.*.*
%attr(755,root,root) %{_libdir}/libXmu.so.*.*
%attr(755,root,root) %{_libdir}/libXp.so.*.*
%attr(755,root,root) %{_libdir}/libXpm.so.*.*
%attr(755,root,root) %{_libdir}/libXrandr.so.*.*
+%attr(755,root,root) %{_libdir}/libXrender.so.*.*.*
%attr(755,root,root) %{_libdir}/libXss.so.*.*
%attr(755,root,root) %{_libdir}/libXt.so.*.*
%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%ifnarch amd64
%attr(755,root,root) %{_libdir}/modules/drivers/linux
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
%endif
-%ifarch %{ix86} sparc sparc64 amd64
+%ifarch %{ix86} ia64 amd64 sparc sparc64
%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/aiptek.4*
-%{_mandir}/man4/citron*
+%{_mandir}/man4/citron.4*
%{_mandir}/man4/dmc.4*
-%{_mandir}/man4/dynapro*
+%{_mandir}/man4/dynapro.4*
+%{_mandir}/man4/elographics.4*
%{_mandir}/man4/fbdevhw.4*
%{_mandir}/man4/fpit.4*
%{_mandir}/man4/js_x.4*
%{_mandir}/man4/kbd.4*
-%{_mandir}/man4/keyboard*
-%{_mandir}/man4/microtouch*
+%{_mandir}/man4/keyboard.4*
+%{_mandir}/man4/microtouch.4*
%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/mutouch.4*
%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/ur98.4*
%ifnarch amd64
-%{_mandir}/man4/v4l*
+%{_mandir}/man4/v4l.4*
%endif
-%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64
-%{_mandir}/man4/vga*
+%ifarch %{ix86} ia64 amd64 sparc sparc64 alpha ppc arm
+%{_mandir}/man4/vga.4*
%endif
-%ifarch %{ix86} sparc sparc64 amd64
-%{_mandir}/man4/vesa*
+%ifarch %{ix86} ia64 amd64 sparc sparc64
+%{_mandir}/man4/vesa.4*
%endif
-%{_mandir}/man4/void*
-%{_mandir}/man4/wacom*
-%{_mandir}/man4/elographics*
-%{_mandir}/man4/mutouch*
+%{_mandir}/man4/void.4*
+%{_mandir}/man4/wacom.4*
%files setup
%defattr(644,root,root,755)
%{_libdir}/libXRes.a
%{_libdir}/libXTrap.a
%{_libdir}/libXaw.a
+%{_libdir}/libXcursor.a
%{_libdir}/libXext.a
%{_libdir}/libXfont.a
%{_libdir}/libXfontcache.a
+%{_libdir}/libXft.a
%{_libdir}/libXi.a
%{_libdir}/libXinerama.a
%{_libdir}/libXmu.a
%{_libdir}/libXp.a
%{_libdir}/libXpm.a
%{_libdir}/libXrandr.a
+%{_libdir}/libXrender.a
%{_libdir}/libXss.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%attr(755,root,root) %{_bindir}/chooser
%{_mandir}/man1/xdm.1*
-%dir /etc/X11/xdm
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/GiveConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/TakeConsole
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsession
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xsetup_0
-%attr(755,root,root) %config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xwilling
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xaccess
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xresources
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/Xservers
-%config(noreplace) %verify(not size mtime md5) /etc/X11/xdm/xdm-config
-/etc/X11/xdm/pixmaps
-/etc/X11/xdm/authdir
+%dir %{_sysconfdir}/X11/xdm
+%attr(755,root,root) %config(noreplace) %verify(not 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
+%{_sysconfdir}/X11/xdm/pixmaps
+%{_sysconfdir}/X11/xdm/authdir
%files xfs
%defattr(644,root,root,755)
projects / packages / X11.git / blobdiff