X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=XFree86.spec;h=f625bc980e0b8d6c599368bd6216075b07d3d07f;hb=bc457675f89d7c29c8c60a554fe7a60f4b0c52de;hp=7e3467e5f3922b52476bf6f40992481034dbedb3;hpb=7f41ef6edc707a37cc19ff805ee2e262bc1db5d1;p=packages%2FXFree86.git diff --git a/XFree86.spec b/XFree86.spec index 7e3467e..f625bc9 100644 --- a/XFree86.spec +++ b/XFree86.spec @@ -4,14 +4,10 @@ # # Conditional build: -# _without_tdfx - disables tdfx drivers building +%bcond_without tdfx # disables tdfx drivers building # - -%define _sver %(echo %{version} | tr -d .) -%define _synaptics_ver 0.11.3p11 - Summary: XFree86 Window System servers and basic programs -Summary(de): Xfree86 Window-System-Server und grundlegende Programme +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 ¤Î¥µ¡¼¥Ð¤È´ðËÜŪ¤Ê¥×¥í¥°¥é¥à @@ -23,12 +19,13 @@ Summary(ru): Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò Name: XFree86 -Version: 4.3.99.11 -Release: 0.2 +Version: 4.3.99.902 +Release: 4 +Epoch: 1 License: MIT Group: X11/XFree86 Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2 -# Source0-md5: 0aa6cbc6ee19d38f3ab916929f283ac7 +# Source0-md5: eec2d5e4b980ec73a7772b9362ed9021 #Source1: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-2.tgz #Source2: ftp://ftp.xfree86.org/pub/XFree86/4.3.0/source/X430src-3.tgz Source3: ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2 @@ -60,11 +57,17 @@ Source37: xconsole.png Source38: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2 # Source38-md5: a184106bb83cb27c6963944d9243ac3f #Source39: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2 -# http://w1.894.telia.com/~u89404340/touchpad/index.html -Source40: http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2 -# Source40-md5: 4dabd4c8ce8968eba6cde1dd6265c9c7 -Source41: http://www.linux.org.uk/~alan/S3.zip -# Source41-md5: 8b754fc6bbded60b683563b945e384b0 +Source40: %{name}-Xserver-headers +Source41: %{name}-Xserver-headers-links +Source42: twm-xsession.desktop +Source43: xcalc.desktop +Source44: xload.desktop +Source45: xmag.desktop +Source46: xcalc.png +Source47: xload.png +Source48: xmag.png +Source49: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h +# NoSource49-md5: bf9b05a66798796b53ed1a050049b2ee Patch0: %{name}-PLD.patch Patch1: %{name}-HasZlib.patch Patch2: %{name}-DisableDebug.patch @@ -100,7 +103,6 @@ Patch33: %{name}-clearrts.patch Patch34: %{name}-fix-07-s3trio64v2gx+netfinity.patch Patch35: %{name}-i740-driver-update-cvs-20020617.patch Patch36: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch - Patch38: %{name}-tdfx-fix-compiler-warnings.patch Patch39: %{name}-tdfx-fix-vtswitch-font-corruption.patch Patch40: %{name}-Xfont-Type1-large-DoS.patch @@ -114,10 +116,23 @@ Patch44: %{name}-pkgconfig.patch Patch45: %{name}-spencode-nowarning.patch # Small (maybe buggy) patch to resolve problems with totem 0.97.0 Patch46: %{name}-lock.patch -Patch47: %{name}-linux-version.patch -Patch48: %{name}-new-s3-nodebug.patch +Patch47: %{name}-sparc-kbd.patch + +Patch49: %{name}-mandir-fix.patch +Patch50: %{name}-xterm-256colors.patch + +Patch52: %{name}-kernel_headers.patch +Patch53: %{name}-stdint.patch +Patch54: %{name}-fontfile.patch URL: http://www.xfree86.org/ -BuildRequires: %{_bindir}/perl +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} +%endif BuildRequires: bison BuildRequires: ed BuildRequires: expat-devel @@ -127,19 +142,14 @@ BuildRequires: libpng-devel BuildRequires: libstdc++-devel BuildRequires: ncurses-devel BuildRequires: pam-devel +BuildRequires: rpmbuild(macros) >= 1.143 BuildRequires: tcl-devel BuildRequires: utempter-devel BuildRequires: zlib-devel -%ifarch %{ix86} alpha -%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel} -%endif -# Required by xc/programs/Xserver/hw/xfree86/drivers/glide/glide_driver.c -%ifarch %{ix86} -%{!?_without_tdfx:BuildRequires: Glide2x_SDK} -%endif -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{epoch}:%{version} Requires: xauth -ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc +Requires: pam >= 0.77.3 +ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc amd64 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: xpm-progs Obsoletes: xterm @@ -150,16 +160,21 @@ Obsoletes: X11R6.1 %define _prefix /usr/X11R6 %define _mandir %{_prefix}/man -%define _icondir /usr/share/icons -%define _pixmapsdir /usr/share/pixmaps %define _soundsdir /usr/share/sounds %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 XFree86-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 +# ELF objects with Rendition microcode - disliked by ELF utils +%define _noautostrip .*\\.uc +%define _noautochrpath .*\\.uc + %description The X Window System provides the base technology for developing graphical user interfaces. Simply stated, X draws the elements of the @@ -291,6 +306,7 @@ Pliki XFree86 wymagane zar Summary: Display PostScript Summary(pl): Display PostScript Group: X11/XFree86 +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Provides: DPS Obsoletes: dgs @@ -306,7 +322,8 @@ wy Summary: Header files for Display PostScript Summary(pl): Pliki nag³ówkowe dla Display PostScript Group: X11/XFree86 -Requires: %{name}-DPS = %{version} +Requires: %{name}-DPS = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} Obsoletes: dgs-devel %description DPS-devel @@ -319,7 +336,7 @@ Pliki nag Summary: Display PostScript static libraries Summary(pl): Biblioteki statyczne Display PostScript Group: X11/XFree86 -Requires: %{name}-DPS-devel = %{version} +Requires: %{name}-DPS-devel = %{epoch}:%{version}-%{release} Obsoletes: dgs-static %description DPS-static @@ -328,236 +345,12 @@ X-Window Display PostScript static libraries. %description DPS-static -l pl Statyczne biblioteki X-Window Display PostScript. -%package xft1 -Summary: Old version of font rendering library -Summary(pl): Stara wersja biblioteki wy¶wietlaj±cej fonty -Group: X11/XFree86 -Requires: %{name}-libs = %{version} -Requires: %{name}-xrender = %{version} -Obsoletes: XFree86-xft < 4.2.99 - -%description xft1 -Old version of font rendering library. - -%description xft1 -l pl -Stara wersja biblioteki wy¶wietlaj±cej fonty. - -%package xft -Summary: X Font rendering library -Summary(pl): Biblioteka do renderowania fontów -Group: X11/XFree86 -Requires: %{name}-fontconfig = %{version} -Requires: %{name}-libs = %{version} -Requires: %{name}-xrender = %{version} -Provides: Xft = 2.1-2 -Obsoletes: XFree86-xft2 -Obsoletes: Xft - -%description xft -Xft is a font rendering library for X. - -%description xft -l pl -Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window. - -%package xft-devel -Summary: Header files for X Font Rendering library -Summary(pl): Pliki nag³ówkowe dla biblioteki do renderowania fontów -Group: X11/Development/Libraries -Requires: %{name}-xft = %{version} -Requires: %{name}-fontconfig-devel = %{version} -Requires: %{name}-xrender-devel = %{version} -Provides: Xft-devel = 2.1-2 -Obsoletes: XFree86-xft2-devel -Obsoletes: Xft-devel - -%description xft-devel -Xft is a font rendering library for X. - -This package contains the header files needed to develop programs that -use these Xft. - -%description xft-devel -l pl -Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window. - -Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania -programów korzystaj±cych z biblioteki Xft. - -%package xft-static -Summary: X Font Rendering static library -Summary(pl): Statyczna biblioteka do renderowania fontów -Group: X11/Development/Libraries -Requires: %{name}-xft-devel = %{version} -Provides: Xft-static = 2.1-2 -Obsoletes: XFree86-xft2-static -Obsoletes: Xft-static - -%description xft-static -Xft is a font rendering library for X. - -This package contains static libraries. - -%description xft-static -l pl -Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window. - -Ten pakiet zawiera biblioteki statyczne. - -%package fontconfig -Summary: Font configuration and customization library -Summary(pl): Biblioteka do konfigurowania fontów -Group: Libraries -Requires(post): /sbin/ldconfig -Requires: %{name}-libs = %{version} -Provides: %{name}-fontconfig-realpkg = %{version} -Provides: fontconfig = 1.0.1 -Obsoletes: fontconfig - -%description fontconfig -Fontconfig is designed to locate fonts within the system and select -them according to requirements specified by applications. - -%description fontconfig -l pl -Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w -systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji. - -%package fontconfig-devel -Summary: Header files for font configuration and customization library -Summary(pl): Pliki nag³ówkowe dla biblioteki do konfigurowania fontów -Group: Development/Libraries -Requires: %{name}-fontconfig-realpkg = %{version} -Requires: freetype-devel -Provides: %{name}-fontconfig-devel-realpkg = %{version} -Provides: fontconfig-devel = 1.0.1 -Obsoletes: fontconfig-devel - -%description fontconfig-devel -Fontconfig is designed to locate fonts within the system and select -them according to requirements specified by applications. - -This package contains the header files needed to develop programs that -use these fontconfig. - -%description fontconfig-devel -l pl -Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w -systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji. - -Ten pakiet zawiera pliki nag³ówkowe potrzebne do kompilowania -programów korzystaj±cych z biblioteki fontconfig. - -%package fontconfig-static -Summary: Font configuration and customization static library -Summary(pl): Statyczna biblioteka do konfigurowania fontów -Group: Development/Libraries -Requires: %{name}-fontconfig-devel-realpkg = %{version} -Provides: fontconfig-static = 1.0.1 -Obsoletes: fontconfig-static - -%description fontconfig-static -Fontconfig is designed to locate fonts within the system and select -them according to requirements specified by applications. - -This package contains static libraries. - -%description fontconfig-static -l pl -Fontconfig jest biblioteka przeznaczon± do lokalizowania fontów w -systemie i wybierania ich w zale¿no¶ci od potrzeb aplikacji. - -Ten pakiet zawiera biblioteki statyczne. - -%package render -Summary: X Render Extension -Summary(pl): Rozszerzenie X Render -Group: X11/Development/Libraries -Requires: XFree86-devel - -%description render -This package contains header files and documentation for the X render -extension. Library and server implementations are separate. - -%description render -l pl -Pakiet zawiera pliki nag³ówkowe i dokumenetacjê dla rozszerzenia -X render. Biblioteka i implementacja serwera znajduj± siê w osobnym -pakiecie. - -%package xrender -Summary: X Render Extension -Summary(pl): Rozszerzenie X Render -Group: X11/Libraries -Requires: %{name}-libs = %{version} - -%description xrender -X render library. - -%description xrender -l pl -Biblioteka X render. - -%package xrender-devel -Summary: X Render Extension headers -Summary(pl): Pliki nag³ówkowe rozszerzenia X Render -Group: X11/Libraries -Requires: %{name}-devel = %{version} -Requires: %{name}-render = %{version} -Requires: %{name}-xrender = %{version} - -%description xrender-devel -X render library headers. - -%description xrender-devel -l pl -Pliki nag³ówkowe biblioteki X render. - -%package xrender-static -Summary: X Render static library -Summary(pl): Biblioteka statyczna X render -Group: X11/Libraries/Development -Requires: %{name}-xrender-devel = %{version} - -%description xrender-static -X render static library. - -%description xrender-static -l pl -Biblioteka statyczna X render. - -%package xcursor -Summary: X cursor library -Summary(pl): Biblioteka X cursor -Group: X11/Libraries -Requires: %{name}-libs = %{version} - -%description xcursor -X cursor library. - -%description xcursor -l pl -Biblioteka X cursor. - -%package xcursor-devel -Summary: X cursor library headers -Summary(pl): Pliki nag³ówkowe biblioteki X cursor -Group: X11/Libraries/Development -Requires: %{name}-devel = %{version} -Requires: %{name}-xcursor = %{version} - -%description xcursor-devel -X cursor library headers. - -%description xcursor-devel -l pl -Pliki nag³ówkowe biblioteki X cursor. - -%package xcursor-static -Summary: X cursor static library -Summary(pl): Biblioteka statyczna X cursor -Group: X11/Libraries/Development -Requires: %{name}-xcursor-devel = %{version} - -%description xcursor-static -X cursor static library. - -%description xcursor-static -l pl -Biblioteka statyczna X cursor. - %package OpenGL-core Summary: OpenGL support for X11R6 Summary(pl): Wsparcie OpenGL dla systemu X11R6 Group: X11/Libraries -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: XFree86-OpenGL-libGL Obsoletes: XFree86-driver-nvidia %description OpenGL-core @@ -566,12 +359,25 @@ OpenGL support for X11R6 system. %description OpenGL-core -l pl Wsparcie OpenGL dla systemu X11R6. +%package OpenGL-libGL +Summary: OpenGL support for X11R6 - GL library +Summary(pl): Wsparcie OpenGL dla systemu X11R6 - biblioteka GL +Group: X11/Libraries +Requires: XFree86-OpenGL-core = %{epoch}:%{version}-%{release} +Obsoletes: XFree86-driver-firegl + +%description OpenGL-libGL +OpenGL support for X11R6 system - GL library. + +%description OpenGL-libGL -l pl +Wsparcie OpenGL dla systemu X11R6 - biblioteka GL. + %package OpenGL-devel Summary: OpenGL for X11R6 development Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 Group: X11/Development/Libraries -Requires: %{name}-OpenGL-libs = %{version} -Requires: %{name}-devel +Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} Requires: OpenGL-devel-base Provides: OpenGL-devel Obsoletes: Mesa-devel @@ -585,29 +391,28 @@ Headers and man pages for OpenGL for X11R6. Pliki nag³ówkowe i manuale do OpenGL dla systemu X11R6. %package OpenGL-devel-base -Summary: OpenGL for X11R6 development (only gl?.h) -Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko gl?.h) +Summary: OpenGL for X11R6 development (GL and GLX only) +Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6 (tylko GL i GLX) Group: X11/Development/Libraries -Requires: %{name}-OpenGL-libs = %{version} -Requires: %{name}-devel -Requires: OpenGL-devel +Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} Provides: OpenGL-devel-base %description OpenGL-devel-base -Base headers (only gl?.h) for OpenGL for X11R6. +Base headers (GL and GLX only) for OpenGL for X11R6. %description OpenGL-devel-base -l pl -Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6. +Podstawowe pliki nag³ówkowe (tylko GL i GLX) OpenGL dla systemu X11R6. %package OpenGL-libs Summary: OpenGL libraries for X11R6 Summary(pl): Biblioteki OpenGL dla systemu X11R6 Group: X11/Libraries -Requires: %{name}-OpenGL-core -Requires: %{name}-libs = %{version} +Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Provides: OpenGL -Obsoletes: %{name}-OpenGL Obsoletes: Mesa +Obsoletes: XFree86-OpenGL %description OpenGL-libs OpenGL libraries for X11R6 system. @@ -619,7 +424,7 @@ Biblioteki OpenGL dla systemu X11R6. Summary: X11R6 static libraries with OpenGL Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL Group: X11/Development/Libraries -Requires: %{name}-OpenGL-devel = %{version} +Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release} Provides: OpenGL-static Obsoletes: Mesa-static @@ -635,8 +440,9 @@ Summary(pl): Serwer XFree86 Xnest Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86 Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86 Group: X11/XFree86/Servers -Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: /usr/X11R6/lib/X11/rgb.txt +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Requires: XFree86-fonts-base %description Xnest @@ -677,8 +483,9 @@ Summary: X print server Summary(pl): X serwer z rozszerzeniem Xprint Group: X11/XFree86/Servers PreReq: xprint-initrc -Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: /usr/X11R6/lib/X11/rgb.txt +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Requires: XFree86-fonts-base %description Xprt @@ -695,17 +502,22 @@ Summary(fr): Serveur XFree86 Summary(pl): Serwer XFree86 Summary(tr): XFree86 sunucusu Group: X11/XFree86/Servers -Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: /usr/X11R6/lib/X11/rgb.txt +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Requires: XFree86-fonts-base Requires: pam -Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono +Obsoletes: XFree86-Mono +Obsoletes: XFree86-SVGA +Obsoletes: XFree86-VGA16 # obsoleted by many drivers: suncg3,suncg6,suncg14,sunffb,sunleo,suntcx -Obsoletes: XFree86-Sun XFree86-Sun24 +Obsoletes: XFree86-Sun +Obsoletes: 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 +Obsoletes: XFree86-XF86Setup +Obsoletes: Xconfigurator %description Xserver Generally used X server which uses display hardware. It requires @@ -752,8 +564,9 @@ Summary(pl): Serwer XFree86 Xvfb Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ Group: X11/XFree86/Servers -Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-common = %{epoch}:%{version}-%{release} +Requires: /usr/X11R6/lib/X11/rgb.txt +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Requires: XFree86-fonts-base %description Xvfb @@ -827,8 +640,8 @@ Summary(ru): Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6 Group: X11/Development/Libraries -Requires: %{name}-libs = %{version} -Requires: imake = %{version} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: imake = %{epoch}:%{version}-%{release} Provides: xpm-devel Obsoletes: xpm-devel %ifarch sparc sparc64 @@ -889,7 +702,7 @@ XFree86-devel ͦ Summary: Header files for XFree86 Xserver drivers/extensions development Summary(pl): Pliki nag³ówkowe do tworzenia sterowników/rozszerzeñ X serwera XFree86 Group: X11/Development/Libraries -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} %description Xserver-devel Header files for XFree86 Xserver drivers and extensions development. @@ -902,8 +715,8 @@ XFree86. Summary: Alliance Promotion video driver Summary(pl): Sterownik do kart Alliance Promotion Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Alliance %description driver-apm @@ -916,8 +729,8 @@ Sterownik do kart Alliance Promotion. Summary: Ark Logic video driver Summary(pl): Sterownik do kart Ark Logic Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-ark Ark Logic driver. @@ -929,9 +742,11 @@ Sterownik do kart Ark Logic. Summary: ATI video driver Summary(pl): Sterownik do kart ATI Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} -Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64 +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +Obsoletes: XFree86-ATI +Obsoletes: XFree86-Mach32 +Obsoletes: XFree86-Mach64 %description driver-ati ATI video driver. @@ -943,11 +758,11 @@ Sterownik do kart ATI. Summary: ATI Rage 128 video driver Summary(pl): Sterownik do kart ATI Rage 128 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL -Conflicts: XFree86-driver-nvidia +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Rage128 +Conflicts: XFree86-driver-nvidia %description driver-r128 ATI Rage 128 video driver. @@ -959,10 +774,10 @@ Sterownik do kart ATI Rage 128. Summary: ATI Radeon video driver Summary(pl): Sterownik do kart ATI Radeon Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL -Requires: XFree86-driver-ati +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release} Conflicts: XFree86-driver-nvidia %description driver-radeon @@ -975,9 +790,11 @@ Sterownik do kart ATI Radeon. Summary: ATI video driver (ATI.2) Summary(pl): Sterownik do kart ATI (ATI.2) Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} -Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64 +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +Obsoletes: XFree86-ATI +Obsoletes: XFree86-Mach32 +Obsoletes: XFree86-Mach64 %description driver-ati.2 ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/). @@ -990,10 +807,10 @@ Sterownik do kart ATI (ATI.2) projektu gatos Summary: ATI Rage 128 video driver (ATI.2) Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2) Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL -Requires: XFree86-driver-ati.2 +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +Requires: %{name}-driver-ati.2 Conflicts: XFree86-driver-nvidia Obsoletes: XFree86-Rage128 @@ -1009,10 +826,10 @@ Sterownik do kart ATI Rage 128 (ATI.2) projektu gatos Summary: ATI Radeon video driver (ATI.2) Summary(pl): Sterownik do kart ATI Radeon (ATI.2) Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL -Requires: XFree86-driver-ati.2 +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +Requires: %{name}-driver-ati.2 Conflicts: XFree86-driver-nvidia %description driver-radeon.2 @@ -1027,8 +844,8 @@ Sterownik do kart ATI Radeon (ATI.2) projektu gatos Summary: Chips and Technologies video driver Summary(pl): Sterownik do kart na uk³adach Chips and Technologies Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-ChipsTechnologies %description driver-chips @@ -1041,8 +858,8 @@ Sterownik do kart na uk Summary: Cirrus Logic video driver Summary(pl): Sterownik do kart Cirrus Logic Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Cirrus %description driver-cirrus @@ -1055,8 +872,8 @@ Sterownik do kart Cirrus Logic. Summary: Cyrix video driver Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Cyrix %description driver-cyrix @@ -1069,8 +886,8 @@ Sterownik do grafiki na uk Summary: Video driver for framebuffer device Summary(pl): Sterownik korzystaj±cy z framebuffera Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-FBDev %description driver-fbdev @@ -1083,8 +900,8 @@ Nieakcelerowany sterownik korzystaj Summary: Video driver for DRI sparc framebuffer device Summary(pl): Sterownik do framebuffera DRI na sparc Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-ffb Video driver for DRI sparc framebuffer device. @@ -1096,8 +913,10 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +# dlopens libglide2x.so +Requires: Glide_VG %description driver-glide Voodoo1 and Voodoo2 video driver. @@ -1109,9 +928,9 @@ Sterownik do kart Voodoo1 i Voodoo2 firmy 3Dfx. Summary: GLINT/Permedia video driver Summary(pl): Sterownik do kart GLINT i Permedia Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Conflicts: XFree86-driver-nvidia Obsoletes: XFree86-3DLabs @@ -1125,8 +944,8 @@ Sterownik do kart GLINT i Permedia. Summary: Number 9 I128 video driver Summary(pl): Sterownik do kart Number 9 I128 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-I128 %description driver-i128 @@ -1139,8 +958,8 @@ Sterownik do kart Number 9 I128. Summary: Intel i740 video driver Summary(pl): Sterownik do kart na uk³adzie Intel i740 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-i740 %description driver-i740 @@ -1153,9 +972,9 @@ Sterownik do kart na uk Summary: Intel i810/i815/i830 video driver Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Conflicts: XFree86-driver-nvidia Obsoletes: XFree86-i810 @@ -1169,8 +988,8 @@ Sterownik do grafiki na uk Summary: Integrated Micro Solutions Twin Turbo 128 driver Summary(pl): Sterownik do kart Integrated Micro Solutions Twin Turbo 128 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-imstt Integrated Micro Solutions Twin Turbo 128 driver. @@ -1182,9 +1001,9 @@ Sterownik do kart Integrated Micro Solutions Twin Turbo 128. Summary: Matrox video driver Summary(pl): Sterownik do kart Matrox Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} Requires: OpenGL +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Conflicts: XFree86-driver-nvidia Obsoletes: XFree86-mga @@ -1198,8 +1017,8 @@ Sterownik do kart Matrox. Summary: NeoMagic video driver Summary(pl): Sterownik do kart NeoMagic Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-NeoMagic %description driver-neomagic @@ -1212,8 +1031,8 @@ Sterownik do kart NeoMagic. Summary: Newport (XL) adapters video driver Summary(pl): Sterownik do kart Newport (XL) Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-newport Newport (XL) adapters video driver (found primarily in SGI Indy and @@ -1227,8 +1046,8 @@ SGI Indy i Indigo). Summary: National Semiconductors GEODE family video driver Summary(pl): Sterownik dla kart na uk³adach z rodziny GEODE firmy National Semiconductors Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-nsc National Semiconductors GEODE family video driver. Supports GXLV (5530 @@ -1243,8 +1062,8 @@ SC1400 oraz GX2 (uk Summary: nVidia video driver Summary(pl): Sterownik do kart na uk³adach firmy nVidia Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-NVidia %description driver-nv @@ -1257,8 +1076,8 @@ Sterownik do kart na uk Summary: Rendition video driver Summary(pl): Sterownik do kart Rendition Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Rendition %description driver-rendition @@ -1271,8 +1090,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-S3V %description driver-s3virge @@ -1285,8 +1104,8 @@ Sterownik do kart na uk Summary: S3 Trio video driver Summary(pl): Sterownik do kart na uk³adach S3 Trio Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-S3 %description driver-s3 @@ -1299,8 +1118,8 @@ Sterownik do kart na uk Summary: S3 Savage video driver Summary(pl): Sterownik do kart na uk³adach S3 Savage Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-savage S3 Savage video driver. @@ -1312,8 +1131,8 @@ Sterownik do kart na uk Summary: Silicon Motion video driver Summary(pl): Sterownik do kart na uk³adach Silicon Motion Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-siliconmotion Silicon Motion video driver. @@ -1325,8 +1144,8 @@ Sterownik do kart na uk Summary: SiS video driver Summary(pl): Sterownik do kart na uk³adach SiS Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-SiS %description driver-sis @@ -1339,8 +1158,8 @@ Sterownik do kart na uk Summary: sunbw2 - Sun BW2 video driver Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-SunMono %description driver-sunbw2 @@ -1353,8 +1172,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-suncg14 suncg14 - Sun CG14 video driver. @@ -1366,8 +1185,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-suncg3 suncg3 - Sun CG3 video cards driver. @@ -1379,8 +1198,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-suncg6 suncg6 - Sun GX and Turbo GX video driver. @@ -1392,8 +1211,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-sunffb sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver. @@ -1405,8 +1224,8 @@ 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 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-sunleo sunleo - Sun Leo (ZX) video cards driver. @@ -1418,8 +1237,8 @@ Sterownik do kart Sun Leo (ZX). Summary: suntcx - Sun TCX video cards driver Summary(pl): Sterownik do kart Sun TCX Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-suntcx suntcx - Sun TCX video cards driver. @@ -1431,12 +1250,13 @@ Sterownik do kart Sun TCX. Summary: 3Dfx video driver Summary(pl): Sterownik do kart 3Dfx Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} +# dlopens libglide3x.so Requires: Glide3-DRI Requires: OpenGL -Conflicts: XFree86-driver-nvidia Obsoletes: XFree86-3dfx +Conflicts: XFree86-driver-nvidia %description driver-tdfx 3Dfx video driver. Supports Voodoo Banshee, Voodoo3, Voodoo4, Voodoo5. @@ -1452,8 +1272,8 @@ a Glide_V5-DRI do kart Voodoo4 lub Voodoo5. Summary: TGA video driver Summary(pl): Sterownik do kart TGA Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-TGA %description driver-tga @@ -1466,8 +1286,8 @@ Sterownik do kart TGA. Summary: Trident video driver Summary(pl): Sterownik do kart Trident Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Trident %description driver-trident @@ -1480,8 +1300,8 @@ Sterownik do kart Trident. Summary: Tseng Labs video driver Summary(pl): Sterownik do kart Tseng Labs Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} Obsoletes: XFree86-Tseng XFree86-W32 %description driver-tseng @@ -1494,8 +1314,8 @@ Sterownik do kart firmy Tseng Labs. Summary: VIA CLE266 driver Summary(pl): Sterownik do kart VIA CLE266 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-via VIA CLE266 driver. @@ -1507,8 +1327,8 @@ Sterownik do kart VIA CLE266. Summary: VMWare SVGA emulated video driver Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware Group: X11/XFree86 -Requires: %{name}-Xserver = %{version}-%{release} -Requires: %{name}-modules = %{version}-%{release} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} +Requires: %{name}-modules = %{epoch}:%{version}-%{release} %description driver-vmware VMware emulated SVGA video driver. Necessary if you run Linux on @@ -1531,7 +1351,7 @@ Group: X11/XFree86 Requires(post,postun): /sbin/ldconfig Requires(post,postun): grep Requires(postun): fileutils -Requires: %{name}-common = %{version} +Requires: %{name}-common = %{epoch}:%{version}-%{release} Provides: xpm Obsoletes: xpm @@ -1638,7 +1458,7 @@ Summary(pl): Graficzny konfigurator dla XFree86 Summary(ru): õÔÉÌÉÔÁ ÄÌÑ ËÏÎÆÉÇÕÒÁÃÉÉ XFree86 Summary(uk): õÔÉ̦ÔÁ ÄÌÑ ËÏÎƦÇÕÒÕ×ÁÎÎÑ XFree86 Group: X11/XFree86 -Requires: %{name}-Xserver = %{version} +Requires: %{name}-Xserver = %{epoch}:%{version}-%{release} Obsoletes: XFree86-xf86cfg %description setup @@ -1665,12 +1485,11 @@ Summary(pl): Biblioteki statyczne X11R6 Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6 Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6 Group: X11/Development/Libraries -Requires: %{name}-devel = %{version} +Requires: %{name}-devel = %{epoch}:%{version}-%{release} %ifarch sparc sparc64 Obsoletes: X11R6.1-devel %endif Obsoletes: xpm-static -#Obsoletes: Mesa-static %description static X11R6 static libraries. @@ -1693,8 +1512,8 @@ Summary(pl): R Summary(ru): òÁÚÎÏÏÂÒÁÚÎÙÅ ÕÔÉÌÉÔÙ ÄÌÑ XFree86 Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86 Group: X11/XFree86 -Requires: %{name} >= %{version} -Requires: XFree86-libs = %{version} +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: man-config Obsoletes: X11R6-contrib @@ -1757,6 +1576,48 @@ Xconfigurator, XFree86-xfs ãÅÊ ÐÁËÅÔ Í¦ÓÔÉÔØ ÕÓ¦ ÐÒÏÇÒÁÍÉ, Ñ˦ ÒÁΦÛÅ ×ÈÏÄÉÌÉ ÄÏ X11R6-contrib. +%package -n XcursorTheme-handhelds +Summary: Cursors Theme "handhelds" +Summary(pl): Motyw kursorów "handhelds" +Group: X11/Themes +Requires: XFree86-libs +Requires: xcursor +Conflicts: XFree86 < 4.3.99.901-0.2 + +%description -n XcursorTheme-handhelds +Cursors theme "handhelds" for X11. + +%description -n XcursorTheme-handhelds -l pl +Motyw kursorów "handhelds" dla X11. + +%package -n XcursorTheme-redglass +Summary: Cursors theme "redglass" +Summary(pl): Motyw kursorów "redglass" +Group: X11/Themes +Requires: XFree86-libs +Requires: xcursor +Conflicts: XFree86 < 4.3.99.901-0.2 + +%description -n XcursorTheme-redglass +Cursors theme "redglass" for X11. + +%description -n XcursorTheme-redglass -l pl +Motyw kursorów "redglass" dla X11. + +%package -n XcursorTheme-whiteglass +Summary: Cursors theme "whiteglass" +Summary(pl): Motyw kursorów "whiteglass" +Group: X11/Themes +Requires: XFree86-libs +Requires: xcursor +Conflicts: XFree86 < 4.3.99.901-0.2 + +%description -n XcursorTheme-whiteglass +Cursors theme "whiteglass" for X11. + +%description -n XcursorTheme-whiteglass -l pl +Motyw kursorów "whiteglass" dla X11. + %package -n imake Summary: C preprocessor interface to the make utility Summary(pl): Miedzymordzie do make oparte o preprocesor C @@ -1804,7 +1665,7 @@ Summary(pl): Twm - podstawowy zarz Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ Group: X11/Window Managers -Requires: XFree86-libs = %{version} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description -n twm Twm is a window manager for the X Window System. It provides @@ -1828,7 +1689,7 @@ definiowalne przypisania klawiszy i przycisk Summary: xauth - X authority file utility Summary(pl): xauth - narzêdzie do plików X authority Group: X11/XFree86 -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} %description -n xauth The xauth program is used to edit and display the authorization @@ -1852,11 +1713,10 @@ Summary(uk): Group: X11/XFree86 PreReq: rc-scripts Requires(post,preun): /sbin/chkconfig -Requires: %{name} = %{version} -Requires: %{name}-libs = %{version} -Requires: /usr/X11R6/bin/sessreg +Requires: %{name} = %{epoch}:%{version}-%{release} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: pam >= 0.71 -Requires: sessreg = %{version} +Requires: sessreg = %{epoch}:%{version}-%{release} Requires: /usr/X11R6/bin/sessreg Provides: XDM Obsoletes: XFree86-xdm @@ -1894,9 +1754,10 @@ Requires(pre): /usr/sbin/groupadd Requires(post,preun): /sbin/chkconfig Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel -Requires: %{name}-libs = %{version} +Requires: %{name}-libs = %{epoch}:%{version}-%{release} Requires: XFree86-fonts-base -Obsoletes: xfsft XFree86-xfs +Obsoletes: XFree86-xfs +Obsoletes: xfsft %description -n xfs This is a font server for XFree86. You can serve fonts to other X @@ -1933,7 +1794,7 @@ System. #--- %prep --------------------------- %prep -%setup -q -c -b3 -a40 -a41 +%setup -q -c -b3 #-b1 -b2 -a3 %patch0 -p0 %patch1 -p1 @@ -1971,19 +1832,22 @@ System. %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) -%{!?_without_tdfx:%patch36 -p0} +%{?with_tdfx:%patch36 -p0} #%patch38 -p0 -- causing problems IIRC (but not really needed) -%{!?_without_tdfx:%patch39 -p0} +%{?with_tdfx:%patch39 -p0} %patch40 -p1 %{!?debug:%patch41 -p1} -%{?_without_tdfx:%patch42 -p0} +%{!?with_tdfx:%patch42 -p0} %patch43 -p0 %patch44 -p0 %patch45 -p1 %patch46 -p0 %patch47 -p1 -tar xfz *.tar.gz -%patch48 -p0 +%patch49 -p1 +%patch50 -p0 +%patch52 -p1 +%patch53 -p0 +%patch54 -p0 rm -f xc/config/cf/host.def @@ -2007,8 +1871,8 @@ rm -rf xc/fonts CXXOPTIONS="%{rpmcflags}" \ CXXDEBUGFLAGS="" \ CDEBUGFLAGS="" \ - ICONDIR="%{_icondir}" \ - LINUXDIR="%{_kernelsrcdir}" + ICONDIR="%{_iconsdir}" \ + LINUXDIR="/dev/null" %ifnarch alpha #%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles @@ -2019,55 +1883,21 @@ rm -rf xc/fonts # "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" %endif -%ifarch %{ix86} mips ppc arm -olddir=$(pwd) -cd LinuxDriver/2D -sed -i -e 's#$(XF86OSSRC)/vbe#$(XF86SRC)/vbe#g' Imakefile -xmkmf $olddir/xc . -%{__make} -S savage_drv.o \ - DEFAULT_OS_CPU_FROB=%{_target_cpu} \ - CC="%{__cc}" \ - BOOTSTRAPCFLAGS="%{rpmcflags}" \ - CCOPTIONS="%{rpmcflags}" \ - CXXOPTIONS="%{rpmcflags}" \ - CXXDEBUGFLAGS="" \ - CDEBUGFLAGS="" \ - ICONDIR="%{_icondir}" \ - LINUXDIR="%{_kernelsrcdir}" -cd $olddir -%endif - -%ifnarch sparc sparc64 -TOPDIR=$(pwd)/xc -%{__make} -S -C synaptics clean all \ - TOP="$TOPDIR" \ - CC="%{__cc}" \ - BOOTSTRAPCFLAGS="%{rpmcflags}" \ - CCOPTIONS="%{rpmcflags}" \ - CXXOPTIONS="%{rpmcflags}" \ - CXXDEBUGFLAGS="" \ - CDEBUGFLAGS="" \ - ICONDIR="%{_icondir}" \ - LINUXDIR="%{_kernelsrcdir}" - -cd synaptics -for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do - cp -f ${f} ${f}.synaptics -done -%endif - #--- %install ------------------------ %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,sysconfig} \ - $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} \ +install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \ + $RPM_BUILD_ROOT%{_sysconfdir}/X11/fs \ + $RPM_BUILD_ROOT%{_appdefsdir}/{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 \ $RPM_BUILD_ROOT%{_sbindir} \ $RPM_BUILD_ROOT/usr/{bin,include,lib} \ $RPM_BUILD_ROOT/var/{log,lib/xkb} \ - $RPM_BUILD_ROOT%{_applnkdir}/{Amusements,Editors,Utilities,Terminals} \ - $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} + $RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir}/mini,%{_pixmapsdir}/mini} \ + $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}} \ + $RPM_BUILD_ROOT%{_xsessdir} \ + $RPM_BUILD_ROOT%{_pkgconfigdir} %{__make} -C xc install install.man \ DESTDIR="$RPM_BUILD_ROOT" \ @@ -2080,12 +1910,8 @@ install -d $RPM_BUILD_ROOT/etc/{X11/fs,pam.d,rc.d/init.d,security/console.apps,s CXXOPTIONS="%{rpmcflags}" \ CXXDEBUGFLAGS="" \ CDEBUGFLAGS="" \ - ICONDIR="%{_icondir}" \ - LINUXDIR="%{_kernelsrcdir}" - -%ifnarch sparc sparc64 -install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input -%endif + ICONDIR="%{_iconsdir}" \ + LINUXDIR="/dev/null" %ifnarch alpha #install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri} @@ -2095,10 +1921,10 @@ install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input # $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri %endif -%ifarch %{ix86} mips ppc arm -install -d $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers -install LinuxDriver/2D/savage_drv.o $RPM_BUILD_ROOT%{_libdir}/modules.s3/drivers -%endif +# fix pkgconfig path +if [ "%{_pkgconfigdir}" != "/usr/lib/pkgconfig" ] ; then + mv $RPM_BUILD_ROOT/usr/lib/pkgconfig/* $RPM_BUILD_ROOT%{_pkgconfigdir} +fi # setting default X rm -f $RPM_BUILD_ROOT%{_bindir}/X @@ -2109,7 +1935,7 @@ ln -sf %{_bindir}/XFree86 $RPM_BUILD_ROOT%{_sysconfdir}/X11/X # add X11 links in /usr/bin, /usr/lib /usr/include ln -sf %{_includedir}/X11 $RPM_BUILD_ROOT/usr/include/X11 -ln -sf %{_libdir}/X11 $RPM_BUILD_ROOT/usr/lib/X11 +ln -sf %{_libx11dir} $RPM_BUILD_ROOT/usr/lib/X11 ln -sf %{_bindir} $RPM_BUILD_ROOT/usr/bin/X11 # fix libGL*.so links @@ -2117,12 +1943,29 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/libGL*.so ln -sf libGL.so.1 $RPM_BUILD_ROOT%{_libdir}/libGL.so ln -sf libGLU.so.1 $RPM_BUILD_ROOT%{_libdir}/libGLU.so -# collect Xserver headers -install -d $RPM_BUILD_ROOT%{_includedir}/X11/Xserver -cd xc/programs/Xserver -# don't change to single install - there are symlinked "duplicates" -install include/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver -install hw/xfree86/{common,os-support}/*.h $RPM_BUILD_ROOT%{_includedir}/X11/Xserver +# 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 XFree86 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 + +# move instead of symlinking +rm -f $RPM_BUILD_ROOT/usr/include/GL +mv -f $RPM_BUILD_ROOT%{_includedir}/GL $RPM_BUILD_ROOT/usr/include + +# get the most current OpenGL extensions +cp -f %{SOURCE49} $RPM_BUILD_ROOT/usr/include/GL/glext.h + +# don't include shared version due to Motif issues +rm -f $RPM_BUILD_ROOT%{_libdir}/libGLw.so* + +# collect Xserver headers and make symlinks +for f in `cat %{SOURCE40}`; do + install -D xc/${f} $RPM_BUILD_ROOT%{_includedir}/X11/Xserver/${f} +done +cd $RPM_BUILD_ROOT%{_includedir}/X11/Xserver +sh %{SOURCE41} cd - # set up PLD xdm config @@ -2135,39 +1978,40 @@ 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 %{SOURCE9} $RPM_BUILD_ROOT%{_appdefsdir}/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%{_pixmapsdir} -install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \ - %{SOURCE36} %{SOURCE37} \ +install %{SOURCE21} %{SOURCE22} %{SOURCE23} %{SOURCE24} %{SOURCE25} \ + %{SOURCE26} %{SOURCE27} %{SOURCE43} %{SOURCE44} %{SOURCE45} \ + $RPM_BUILD_ROOT%{_desktopdir} +install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \ + %{SOURCE35} %{SOURCE36} %{SOURCE37} %{SOURCE46} %{SOURCE47} \ + %{SOURCE48} \ $RPM_BUILD_ROOT%{_pixmapsdir} bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir} +# twm desktop file for gdm/kdm support +install %{SOURCE42} $RPM_BUILD_ROOT%{_xsessdir}/twm.desktop + :> $RPM_BUILD_ROOT/etc/security/console.apps/xserver :> $RPM_BUILD_ROOT/etc/security/blacklist.xserver :> $RPM_BUILD_ROOT/etc/security/blacklist.xdm -ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libdir}/X11/fonts +ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts # do not duplicate xkbcomp program -rm -f $RPM_BUILD_ROOT%{_libdir}/X11/xkb/xkbcomp +rm -f $RPM_BUILD_ROOT%{_libx11dir}/xkb/xkbcomp ln -sf %{_bindir}/xkbcomp $RPM_BUILD_ROOT%{_sysconfdir}/X11/xkb/xkbcomp -ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libdir}/X11/doc +ln -sf /usr/share/doc/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc -rm -f $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def +rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def -:> $RPM_BUILD_ROOT%{_libdir}/X11/config/host.def +:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def :> $RPM_BUILD_ROOT%{_sysconfdir}/X11/XF86Config rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html @@ -2175,9 +2019,6 @@ rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html # resolve conflict with man-pages mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4} -# fix mkfontscale path -perl -pi -e "s#mkfontscale#%{_bindir}/mkfontscale#g" $RPM_BUILD_ROOT%{_bindir}/mkfontdir - # directories for applications locales echo '%defattr(644,root,root,755)' > XFree86-libs.lang for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \ @@ -2187,11 +2028,6 @@ for lang in af az bg bg_BG.cp1251 br ca cs da de el en_GB eo es et eu fi \ echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang done -%ifnarch sparc sparc64 -install synaptics/synclient $RPM_BUILD_ROOT%{_bindir} -install synaptics/*.synaptics $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version} -%endif - %ifnarch sparc sparc64 gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/* @@ -2199,31 +2035,34 @@ gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/* 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 #--- %post{un}, %preun, %verifyscript, %trigge ---------- -%post DPS -p /sbin/ldconfig -%postun DPS -p /sbin/ldconfig - -%post xft1 -p /sbin/ldconfig -%postun xft1 -p /sbin/ldconfig +%post DPS -p /sbin/ldconfig +%postun DPS -p /sbin/ldconfig -%post xft -p /sbin/ldconfig -%postun xft -p /sbin/ldconfig - -%post fontconfig -/sbin/ldconfig -HOME=/root %{_bindir}/fc-cache -f 2>/dev/null +%post OpenGL-libGL -p /sbin/ldconfig +%postun OpenGL-libGL -p /sbin/ldconfig -%postun fontconfig -p /sbin/ldconfig - -%post OpenGL-core -p /sbin/ldconfig -%postun OpenGL-core -p /sbin/ldconfig - -%post OpenGL-libs -p /sbin/ldconfig -%postun OpenGL-libs -p /sbin/ldconfig +%post OpenGL-libs -p /sbin/ldconfig +%postun OpenGL-libs -p /sbin/ldconfig %post libs umask 022 @@ -2316,42 +2155,35 @@ if [ "$1" = "0" ]; then /usr/sbin/groupdel xfs 2>/dev/null fi -%post xrender -p /sbin/ldconfig -%postun xrender -p /sbin/ldconfig - -%post xcursor -p /sbin/ldconfig -%postun xcursor -p /sbin/ldconfig - #--- %files -------------------------- %files %defattr(644,root,root,755) %ifnarch sparc sparc64 %doc %{_docdir}/%{name}-%{version} -%doc %{_libdir}/X11/doc -%endif - -%{_libdir}/X11/app-defaults/UXTerm -%{_libdir}/X11/app-defaults/XCalc -%{_libdir}/X11/app-defaults/XCalc-color -%{_libdir}/X11/app-defaults/XClipboard -%{_libdir}/X11/app-defaults/XClock -%{_libdir}/X11/app-defaults/XLoad -%{_libdir}/X11/app-defaults/XLogo -%{_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 -%dir %{_icondir} -%{_icondir}/* - -%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/fonts -%attr(755,root,root) %{_libdir}/X11/xinit -%attr(755,root,root) %{_libdir}/X11/xsm +%doc %{_libx11dir}/doc +%endif + +%{_appdefsdir}/UXTerm +%{_appdefsdir}/XCalc +%{_appdefsdir}/XCalc-color +%{_appdefsdir}/XClipboard +%{_appdefsdir}/XClock +%{_appdefsdir}/XClock-color +%{_appdefsdir}/XLoad +%{_appdefsdir}/XLogo +%{_appdefsdir}/XLogo-color +%{_appdefsdir}/XSm +%{_appdefsdir}/XTerm +%lang(pl) %{_appdefsdir}/pl/XTerm +%{_appdefsdir}/XTerm-color + +%attr(755,root,root) %{_libx11dir}/lbxproxy +%attr(755,root,root) %{_libx11dir}/proxymngr +%attr(755,root,root) %{_libx11dir}/rstart +%attr(755,root,root) %{_libx11dir}/fonts +%attr(755,root,root) %{_libx11dir}/xinit +%attr(755,root,root) %{_libx11dir}/xsm %dir /etc/X11/xinit %dir /etc/X11/lbxproxy @@ -2372,8 +2204,8 @@ fi %dir /etc/X11/xsm /etc/X11/xsm/* -%dir %{_libdir}/X11/x11perfcomp -%attr(755,root,root) %{_libdir}/X11/x11perfcomp/* +%dir %{_libx11dir}/x11perfcomp +%attr(755,root,root) %{_libx11dir}/x11perfcomp/* %attr(755,root,root) %{_bindir}/Xmark %attr(755,root,root) %{_bindir}/appres @@ -2403,9 +2235,6 @@ fi %attr(755,root,root) %{_bindir}/smproxy %attr(755,root,root) %{_bindir}/startx %attr(755,root,root) %{_bindir}/sxpm -%ifnarch sparc sparc64 -%attr(755,root,root) %{_bindir}/synclient -%endif %attr(755,root,root) %{_bindir}/uxterm %attr(755,root,root) %{_bindir}/xcmsdb %attr(755,root,root) %{_bindir}/xconsole @@ -2446,10 +2275,13 @@ fi %{_includedir}/X11/bitmaps %{_includedir}/X11/pixmaps -%{_applnkdir}/Utilities/xconsole.desktop -%{_applnkdir}/Terminals/* -%{_libdir}/X11/app-defaults/Xvidtune -%{_pixmapsdir}/x* +%{_desktopdir}/xconsole.desktop +%{_desktopdir}/xterm.desktop +%{_pixmapsdir}/xconsole.png +%{_pixmapsdir}/xlogo64.png +%{_pixmapsdir}/xterm.png + +%{_appdefsdir}/Xvidtune %{_mandir}/man1/Xmark.1* %{_mandir}/man1/appres.1* @@ -2541,8 +2373,8 @@ fi /usr/lib/X11 %dir %{_bindir} %dir %{_libdir} -%dir %{_libdir}/X11 -%{_libdir}/X11/rgb.txt +%dir %{_libx11dir} +%{_libx11dir}/rgb.txt %files DPS %defattr(644,root,root,755) @@ -2571,123 +2403,66 @@ fi %{_libdir}/libdpstk.a %{_libdir}/libpsres.a -%files xft1 -%defattr(644,root,root,755) -%attr(755,root,root) %{_libdir}/libXft.so.1.1 - -#%files xft -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_libdir}/libXft.so.2.1 - -#%files xft-devel -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_bindir}/xft-config -#%{_includedir}/X11/Xft -#%{_libdir}/libXft.so -#%{_mandir}/man3/Xft.3* -#%{_pkgconfigdir}/xft.pc - -#%files xft-static -#%defattr(644,root,root,755) -#%{_libdir}/libXft.a - -#%files fontconfig -#%defattr(644,root,root,755) -#%dir %{_sysconfdir}/fonts -#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/fonts/fonts.conf -#%{_sysconfdir}/fonts/fonts.dtd -#%attr(755,root,root) %{_bindir}/fc-* -#%attr(755,root,root) %{_libdir}/libfontconfig.so.1.0 -#%{_mandir}/man1/fc-*.1* - -#%files fontconfig-devel -#%defattr(644,root,root,755) -##%attr(755,root,root) %{_bindir}/fontconfig-config -#%{_includedir}/fontconfig -#%{_libdir}/libfontconfig.so -##%{_pkgconfigdir}/fontconfig.pc -#%{_mandir}/man3/fontconfig.3* - -#%files fontconfig-static -#%defattr(644,root,root,755) -#%{_libdir}/libfontconfig.a - -#%files render -#%defattr(644,root,root,755) -#%{_includedir}/X11/extensions/render.h -#%{_includedir}/X11/extensions/renderproto.h - -#%files xrender -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_libdir}/libXrender.so.*.* - -#%files xrender-devel -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_libdir}/libXrender.so -#%{_includedir}/X11/extensions/Xrender.h - -#%files xrender-static -#%defattr(644,root,root,755) -#%{_libdir}/libXrender.a - -#%files xcursor -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_libdir}/libXcursor.so.*.* - -#%files xcursor-devel -#%defattr(644,root,root,755) -#%attr(755,root,root) %{_bindir}/xcursor-config -#%attr(755,root,root) %{_libdir}/libXcursor.so -#%{_includedir}/X11/Xcursor -#%{_pkgconfigdir}/xcursor.pc - -#%files xcursor-static -#%defattr(644,root,root,755) -#%{_libdir}/libXcursor.a - %files OpenGL-core %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/glxgears -%attr(755,root,root) %{_libdir}/libGL.so.*.* -%attr(755,root,root) %{_libdir}/libGL.so -%attr(755,root,root) /usr/lib/libGL.so* %attr(755,root,root) %{_libdir}/modules/extensions/libglx.a %attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a %{_mandir}/man1/glxgears.1x* +%files OpenGL-libGL +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libGL.so.*.* +%attr(755,root,root) %{_libdir}/libGL.so +# Linux OpenGL ABI compatibility symlinks +%attr(755,root,root) /usr/%{_lib}/libGL.so.1 +%attr(755,root,root) /usr/%{_lib}/libGL.so + %files OpenGL-devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libGLU.so -%attr(755,root,root) %{_libdir}/libOSMesa*.so +%attr(755,root,root) %{_libdir}/libOSMesa.so +# Linux OpenGL ABI compatibility symlink +%attr(755,root,root) /usr/%{_lib}/libGLU.so %{_libdir}/libGLw.a -%dir %{_includedir}/GL %dir /usr/include/GL -%attr(644,root,root) %{_includedir}/GL/* -%exclude %{_includedir}/GL/gl.h -%exclude %{_includedir}/GL/glx.h -%exclude %{_includedir}/GL/glxtokens.h +/usr/include/GL/GLwDrawA.h +/usr/include/GL/GLwDrawAP.h +/usr/include/GL/GLwMDrawA.h +/usr/include/GL/GLwMDrawAP.h +/usr/include/GL/glu.h +/usr/include/GL/glxext.h +/usr/include/GL/glxint.h +/usr/include/GL/glxmd.h +/usr/include/GL/glxproto.h +/usr/include/GL/osmesa.h %{_mandir}/man3/gl[A-Z]* %{_mandir}/man3/glu* %{_mandir}/man3/GLw* %files OpenGL-devel-base %defattr(644,root,root,755) -%{_includedir}/GL/gl.h -%{_includedir}/GL/glx.h -%{_includedir}/GL/glxtokens.h +/usr/include/GL/gl.h +/usr/include/GL/glx.h +/usr/include/GL/glext.h +/usr/include/GL/glxtokens.h %files OpenGL-libs %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/glxinfo %attr(755,root,root) %{_libdir}/libGLU.so.*.* +# to be fixed: it contains unresolved symbols and would need -lXm +#%attr(755,root,root) %{_libdir}/libGLw.so.*.* %attr(755,root,root) %{_libdir}/libOSMesa.so.*.* +# Linux OpenGL ABI compatibility symlink +%attr(755,root,root) /usr/%{_lib}/libGLU.so.1 %{_mandir}/man1/glxinfo.1* %files OpenGL-static %defattr(644,root,root,755) %{_libdir}/libGL.a %{_libdir}/libGLU.a -%{_libdir}/libOSMesa*.a +%{_libdir}/libOSMesa.a %files Xnest %defattr(644,root,root,755) @@ -2702,14 +2477,18 @@ fi %defattr(644,root,root,755) %attr(4755,root,root) %{_bindir}/Xwrapper %attr(755,root,root) %{_bindir}/XFree86 +%attr(755,root,root) %{_bindir}/getconfig* %attr(755,root,root) %{_sysconfdir}/X11/X %attr(755,root,root) %{_bindir}/X %{_mandir}/man1/XFree86.1* %{_mandir}/man1/Xserver.1* +%{_mandir}/man1/getconfig.1* %{_mandir}/man5/XF86Config.5* +%{_mandir}/man5/getconfig.5* -%{_libdir}/X11/Cards -%{_libdir}/X11/Options +%{_libx11dir}/Cards +%{_libx11dir}/Options +%{_libx11dir}/getconfig %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/X11/XF86Config %attr(640,root,root) %config %verify(not md5 size mtime) /etc/pam.d/xserver @@ -2724,33 +2503,42 @@ fi %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/bdftopcf -%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so -%attr(755,root,root) %{_libdir}/libXfont*.so -%attr(755,root,root) %{_libdir}/libI*.so -%attr(755,root,root) %{_libdir}/libS*.so -%attr(755,root,root) %{_libdir}/libx*.so +%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}/libSM.so +%attr(755,root,root) %{_libdir}/libX11.so +%attr(755,root,root) %{_libdir}/libXRes.so +%attr(755,root,root) %{_libdir}/libXTrap.so +%attr(755,root,root) %{_libdir}/libXaw.so +%attr(755,root,root) %{_libdir}/libXext.so +%attr(755,root,root) %{_libdir}/libXfont.so +%attr(755,root,root) %{_libdir}/libXfontcache.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}/libXmuu.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}/libXss.so +%attr(755,root,root) %{_libdir}/libXt.so +%attr(755,root,root) %{_libdir}/libXtst.so %attr(755,root,root) %{_libdir}/libXv.so -%{_libdir}/libfntstubs.a -%{_libdir}/libfontenc.a -%{_libdir}/libFS.a -%{_libdir}/libI810XvMC.a -%{_libdir}/liboldX.a +%attr(755,root,root) %{_libdir}/libXvMC.so +%attr(755,root,root) %{_libdir}/libXxf86dga.so +%attr(755,root,root) %{_libdir}/libXxf86misc.so +%attr(755,root,root) %{_libdir}/libXxf86rush.so +%attr(755,root,root) %{_libdir}/libXxf86vm.so +%attr(755,root,root) %{_libdir}/libfontenc.so +%attr(755,root,root) %{_libdir}/libxkbfile.so +%attr(755,root,root) %{_libdir}/libxkbui.so +%attr(755,root,root) %{_libdir}/libxrx.so %{_libdir}/libXau.a %{_libdir}/libXdmcp.a +%{_libdir}/libfntstubs.a +%{_libdir}/liboldX.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 %{_includedir}/X11/*.h %{_includedir}/X11/ICE %{_includedir}/X11/PM @@ -2758,21 +2546,16 @@ fi %{_includedir}/X11/Xaw %{_includedir}/X11/Xmu %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/extensions/*.h %{_includedir}/X11/fonts %{_includedir}/xf86*.h -%{_libdir}/X11/config +%{_libx11dir}/config %exclude %{_includedir}/X11/extensions/Xrender.h %exclude %{_includedir}/X11/extensions/render.h %exclude %{_includedir}/X11/extensions/renderproto.h -%exclude %{_libdir}/libXrender.so -%exclude %{_libdir}/libXcursor.so -%{_mandir}/man3/[A-EH-Z]* +%{_mandir}/man3/[A-FH-Z]* %exclude %{_mandir}/man3/Xft.3* %files Xserver-devel @@ -2780,7 +2563,7 @@ fi %{_includedir}/X11/Xserver # Devel: sparc sparc64 -%ifarch %{ix86} +%ifarch %{ix86} amd64 %files driver-apm %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o @@ -2788,14 +2571,14 @@ fi %endif # Devel: sparc sparc64 -%ifarch %{ix86} +%ifarch %{ix86} 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 +%ifarch %{ix86} mips ppc arm amd64 %files driver-chips %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o @@ -2803,44 +2586,46 @@ fi %endif # Devel: sparc sparc64 -%ifarch %{ix86} alpha +%ifarch %{ix86} alpha amd64 %files driver-cirrus %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o %{_mandir}/man4/cirrus* %endif -%ifarch %{ix86} +%ifarch %{ix86} amd64 %files driver-cyrix %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o %{_mandir}/man4/cyrix* %endif -%ifarch %{ix86} sparc sparc64 mips ppc arm superh +%ifarch %{ix86} sparc sparc64 mips ppc arm superh amd64 %files driver-fbdev %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o -%{_mandir}/man4/fbdev* +%{_mandir}/man4/fbdev.4* %endif %ifarch %{ix86} -%{!?_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*} +%if %{with tdfx} +%files driver-glide +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o +%{_mandir}/man4/glide* +%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 +%ifarch %{ix86} alpha ppc arm amd64 %attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so %endif %{_mandir}/man4/glint* # Devel: sparc sparc64 -%ifarch %{ix86} +%ifarch %{ix86} amd64 %files driver-i128 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o @@ -2865,7 +2650,7 @@ fi %{_mandir}/man4/i810* %endif -# Devel: %{ix86} sparc sparc64 ppc +# Devel: %{ix86} sparc sparc64 ppc amd64 %if 0 %files driver-imstt %defattr(644,root,root,755) @@ -2873,25 +2658,25 @@ fi %{_mandir}/man4/imstt.4* %endif -%ifarch %{ix86} sparc sparc64 mips alpha ppc arm +%ifarch %{ix86} sparc sparc64 mips alpha ppc arm amd64 %files driver-mga %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o -%ifarch %{ix86} alpha ppc arm +%ifarch %{ix86} alpha ppc arm amd64 %attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so %endif %{_mandir}/man4/mga* %endif # Devel: sparc sparc64 -%ifarch %{ix86} +%ifarch %{ix86} amd64 %files driver-neomagic %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o %{_mandir}/man4/neomagic* %endif -# Devel: %{ix86} sparc sparc64 +# Devel: %{ix86} sparc sparc64 amd64 %ifarch mips %files driver-newport %defattr(644,root,root,755) @@ -2907,10 +2692,11 @@ fi %endif # Devel: sparc sparc64 -%ifarch %{ix86} mips alpha arm +%ifarch %{ix86} mips alpha arm ppc amd64 %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* %endif @@ -2921,7 +2707,7 @@ fi %files driver-r128 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o -%ifarch %{ix86} alpha ppc arm +%ifarch %{ix86} alpha ppc arm amd64 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so %endif %{_mandir}/man4/r128* @@ -2929,7 +2715,7 @@ fi %files driver-radeon %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o -%ifarch %{ix86} alpha ppc arm +%ifarch %{ix86} alpha ppc arm amd64 %attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so %attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so %endif @@ -2964,22 +2750,23 @@ fi %endif # Devel: sparc sparc64 -%ifarch %{ix86} alpha +%ifarch %{ix86} alpha amd64 %files driver-rendition %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o +%{_libdir}/modules/*.uc %{_mandir}/man4/rendition* %endif # Devel: sparc sparc64 -%ifarch %{ix86} mips alpha ppc arm +%ifarch %{ix86} mips alpha ppc arm amd64 %files driver-s3virge %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o %{_mandir}/man4/s3virge* %endif -%ifarch %{ix86} mips alpha ppc arm +%ifarch %{ix86} mips alpha ppc arm amd64 %files driver-s3 %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o @@ -2987,32 +2774,27 @@ fi %endif # Devel: sparc sparc64 -%ifarch %{ix86} mips alpha ppc arm +%ifarch %{ix86} mips alpha ppc arm amd64 %files driver-savage %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o -%ifarch %{ix86} mips ppc arm -%dir %{_libdir}/modules.s3 -%dir %{_libdir}/modules.s3/drivers -%attr(755,root,root) %{_libdir}/modules.s3/drivers/savage_drv.o -%endif %{_mandir}/man4/savage* %endif # Devel: sparc sparc64 -%ifarch %{ix86} alpha +%ifarch %{ix86} alpha amd64 %files driver-siliconmotion %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o %{_mandir}/man4/siliconmotion* %endif -%ifarch %{ix86} mips ppc arm +%ifarch %{ix86} mips ppc arm amd64 %files driver-sis %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o %ifarch %{ix86} -#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so +%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so %endif %{_mandir}/man4/sis* %endif @@ -3067,32 +2849,34 @@ fi %{_mandir}/man4/suntcx* %endif -%ifarch %{ix86} sparc sparc64 mips alpha arm -%{!?_without_tdfx:%files driver-tdfx} -%{!?_without_tdfx:%defattr(644,root,root,755)} -%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o} -%ifarch %{ix86} alpha arm -%{!?_without_tdfx:%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so} +%ifarch %{ix86} sparc sparc64 mips alpha arm ppc amd64 +%if %{with tdfx} +%files driver-tdfx +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o +%ifarch %{ix86} alpha arm ppc +%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so +%endif +%{_mandir}/man4/tdfx* %endif -%{!?_without_tdfx:%{_mandir}/man4/tdfx*} %endif # Devel: sparc sparc64 -%ifarch %{ix86} alpha +%ifarch %{ix86} alpha amd64 %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 +%ifarch %{ix86} mips ppc arm amd64 %files driver-trident %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o %{_mandir}/man4/trident* %endif -%ifarch %{ix86} +%ifarch %{ix86} amd64 %files driver-tseng %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o @@ -3116,66 +2900,91 @@ fi %files libs -f XFree86-libs.lang %defattr(644,root,root,755) +%dir /etc/xdg %dir %{_themesdir} %dir %{_themesdir}/Default %dir %{_themesdir}/ThinIce -%{_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 +%{_libx11dir}/XErrorDB +%{_libx11dir}/XKeysymDB +%dir %{_appdefsdir} +%lang(cs) %dir %{_appdefsdir}/cs +%lang(da) %dir %{_appdefsdir}/da +%lang(de) %dir %{_appdefsdir}/de +%lang(es) %dir %{_appdefsdir}/es +%lang(fr) %dir %{_appdefsdir}/fr +%lang(hu) %dir %{_appdefsdir}/hu +%lang(ko) %dir %{_appdefsdir}/ko +%lang(nl) %dir %{_appdefsdir}/nl +%lang(pl) %dir %{_appdefsdir}/pl +%lang(pt) %dir %{_appdefsdir}/pt +%lang(ru) %dir %{_appdefsdir}/ru +%lang(sk) %dir %{_appdefsdir}/sk +%lang(zh_CN) %dir %{_appdefsdir}/zh_CN.gb2312 +%lang(zh_TW) %dir %{_appdefsdir}/zh_TW.big5 +%{_libx11dir}/locale %dir %{_includedir} %dir %{_includedir}/X11 /usr/include/X11 %dir %{_sbindir} %dir %{_datadir}/locale %dir %{_datadir}/misc +%dir %{_iconsdir} +%dir %{_iconsdir}/mini %dir %{_pixmapsdir} %dir %{_pixmapsdir}/mini %dir %{_soundsdir} %dir %{_wmpropsdir} -%attr(755,root,root) %{_libdir}/libX[1Ta-eg-t]*.so.*.* -%attr(755,root,root) %{_libdir}/libXfont*.so.*.* -%attr(755,root,root) %{_libdir}/libI*.so.*.* -%attr(755,root,root) %{_libdir}/libS*.so.*.* -%attr(755,root,root) %{_libdir}/libx*.so.*.* +%dir %{_xsessdir} +%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}/libSM.so.*.* +%attr(755,root,root) %{_libdir}/libX11.so.*.* +%attr(755,root,root) %{_libdir}/libXRes.so.*.* +%attr(755,root,root) %{_libdir}/libXTrap.so.*.* +%attr(755,root,root) %{_libdir}/libXaw.so.*.* +%attr(755,root,root) %{_libdir}/libXext.so.*.* +%attr(755,root,root) %{_libdir}/libXfont.so.*.* +%attr(755,root,root) %{_libdir}/libXfontcache.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}/libXmuu.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}/libXss.so.*.* +%attr(755,root,root) %{_libdir}/libXt.so.*.* +%attr(755,root,root) %{_libdir}/libXtst.so.*.* %attr(755,root,root) %{_libdir}/libXv.so.*.* - -%exclude %{_libdir}/libXrender.so.*.* -%exclude %{_libdir}/libXcursor.so.*.* +%attr(755,root,root) %{_libdir}/libXvMC.so.*.* +%attr(755,root,root) %{_libdir}/libXxf86dga.so.*.* +%attr(755,root,root) %{_libdir}/libXxf86misc.so.*.* +%attr(755,root,root) %{_libdir}/libXxf86rush.so.*.* +%attr(755,root,root) %{_libdir}/libXxf86vm.so.*.* +%attr(755,root,root) %{_libdir}/libfontenc.so.*.* +%attr(755,root,root) %{_libdir}/libxkbfile.so.*.* +%attr(755,root,root) %{_libdir}/libxkbui.so.*.* +%attr(755,root,root) %{_libdir}/libxrx.so.*.* %files modules %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/xkbcomp -%{_libdir}/X11/xkb +%{_libx11dir}/xkb %{_sysconfdir}/X11/xkb /var/lib/xkb %dir %{_libdir}/modules %dir %{_libdir}/modules/dri %dir %{_libdir}/modules/drivers -%ifnarch sparc sparc64 ppc -%{_libdir}/modules/*.uc -%endif %attr(755,root,root) %{_libdir}/modules/*.a %attr(755,root,root) %{_libdir}/modules/codeconv +%ifnarch amd64 %attr(755,root,root) %{_libdir}/modules/drivers/linux -%ifarch %{ix86} sparc sparc64 alpha ppc arm +%endif +%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64 %attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o %endif -%ifarch %{ix86} sparc sparc64 +%ifarch %{ix86} sparc sparc64 amd64 %attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o %endif %dir %{_libdir}/modules/extensions @@ -3187,14 +2996,16 @@ fi %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 +%attr(755,root,root) %{_libx11dir}/xserver %dir /etc/X11/xserver /etc/X11/xserver/SecurityPolicy #%%{_mandir}/man1/xtr* %{_mandir}/man1/xkbcomp.1* +%{_mandir}/man4/aiptek.4* %{_mandir}/man4/citron* %{_mandir}/man4/dmc.4* %{_mandir}/man4/dynapro* +%{_mandir}/man4/fbdevhw.4* %{_mandir}/man4/fpit.4* %{_mandir}/man4/js_x.4* %{_mandir}/man4/kbd.4* @@ -3204,11 +3015,14 @@ fi %{_mandir}/man4/palmax.4* %{_mandir}/man4/penmount.4* %{_mandir}/man4/tek4957.4* +%{_mandir}/man4/ur98.4* +%ifnarch amd64 %{_mandir}/man4/v4l* -%ifarch %{ix86} sparc sparc64 alpha ppc arm +%endif +%ifarch %{ix86} sparc sparc64 alpha ppc arm amd64 %{_mandir}/man4/vga* %endif -%ifarch %{ix86} sparc sparc64 +%ifarch %{ix86} sparc sparc64 amd64 %{_mandir}/man4/vesa* %endif %{_mandir}/man4/void* @@ -3219,35 +3033,47 @@ fi %files setup %defattr(644,root,root,755) %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 -%{_libdir}/X11/app-defaults/XF86Cfg -%ifnarch ppc -%{_mandir}/man1/scanpci.1* -%endif +%{_appdefsdir}/XF86Cfg %{_mandir}/man1/pcitweak.1* +%{_mandir}/man1/scanpci.1* %{_mandir}/man1/xf86cfg.1* %{_mandir}/man1/xf86config.1* %files static %defattr(644,root,root,755) +%{_libdir}/libFS.a +%{_libdir}/libI810XvMC.a %{_libdir}/libICE.a %{_libdir}/libSM.a %{_libdir}/libX11.a %{_libdir}/libXRes.a +%{_libdir}/libXTrap.a %{_libdir}/libXaw.a %{_libdir}/libXext.a %{_libdir}/libXfont.a +%{_libdir}/libXfontcache.a %{_libdir}/libXi.a +%{_libdir}/libXinerama.a %{_libdir}/libXmu.a %{_libdir}/libXmuu.a %{_libdir}/libXp.a %{_libdir}/libXpm.a +%{_libdir}/libXrandr.a +%{_libdir}/libXss.a %{_libdir}/libXt.a %{_libdir}/libXtst.a +%{_libdir}/libXv.a +%{_libdir}/libXvMC.a +%{_libdir}/libXxf86dga.a +%{_libdir}/libXxf86misc.a +%{_libdir}/libXxf86rush.a +%{_libdir}/libXxf86vm.a +%{_libdir}/libfontenc.a +%{_libdir}/libxkbfile.a +%{_libdir}/libxkbui.a %files tools %defattr(644,root,root,755) @@ -3281,8 +3107,8 @@ fi %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 +%{_libx11dir}/xedit +%{_libx11dir}/xman.help %{_mandir}/man1/beforelight.1* %{_mandir}/man1/ico.1* %{_mandir}/man1/listres.1* @@ -3318,33 +3144,55 @@ fi %lang(pl) %{_mandir}/pl/man1/rman.1* -%{_libdir}/X11/app-defaults/Beforelight -%{_libdir}/X11/app-defaults/Bitmap -%{_libdir}/X11/app-defaults/Bitmap-color -%{_libdir}/X11/app-defaults/Clock-color -%{_libdir}/X11/app-defaults/Editres -%{_libdir}/X11/app-defaults/Editres-color -%{_libdir}/X11/app-defaults/Viewres -%{_libdir}/X11/app-defaults/XConsole -%{_libdir}/X11/app-defaults/Xedit -%{_libdir}/X11/app-defaults/Xedit-color -%{_libdir}/X11/app-defaults/Xfd -%{_libdir}/X11/app-defaults/Xgc -%{_libdir}/X11/app-defaults/Xmag -%{_libdir}/X11/app-defaults/Xman -%{_libdir}/X11/app-defaults/Xmessage -%{_libdir}/X11/app-defaults/Xmessage-color -%{_libdir}/X11/app-defaults/Xmh -%{_libdir}/X11/app-defaults/XFontSel -%{_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 -%{_pixmapsdir}/oclock* +%{_appdefsdir}/Beforelight +%{_appdefsdir}/Bitmap +%{_appdefsdir}/Bitmap-color +%{_appdefsdir}/Clock-color +%{_appdefsdir}/Editres +%{_appdefsdir}/Editres-color +%{_appdefsdir}/Viewres +%{_appdefsdir}/XConsole +%{_appdefsdir}/Xedit +%{_appdefsdir}/Xedit-color +%{_appdefsdir}/Xfd +%{_appdefsdir}/Xgc +%{_appdefsdir}/Xmag +%{_appdefsdir}/Xman +%{_appdefsdir}/Xmessage +%{_appdefsdir}/Xmessage-color +%{_appdefsdir}/Xmh +%{_appdefsdir}/XFontSel +%{_appdefsdir}/Xditview +%{_appdefsdir}/Xditview-chrtr + +%{_desktopdir}/oclock.desktop +%{_desktopdir}/xcalc.desktop +%{_desktopdir}/xclipboard.desktop +%{_desktopdir}/xclock.desktop +%{_desktopdir}/xedit.desktop +%{_desktopdir}/xeyes.desktop +%{_desktopdir}/xload.desktop +%{_desktopdir}/xmag.desktop +%{_pixmapsdir}/oclock.png +%{_pixmapsdir}/xcalc.png +%{_pixmapsdir}/xclipboard.png +%{_pixmapsdir}/xclock.png +%{_pixmapsdir}/xedit.png +%{_pixmapsdir}/xeyes.png +%{_pixmapsdir}/xload.png +%{_pixmapsdir}/xmag.png + +%files -n XcursorTheme-handhelds +%defattr(644,root,root,755) +%{_iconsdir}/handhelds + +%files -n XcursorTheme-redglass +%defattr(644,root,root,755) +%{_iconsdir}/redglass + +%files -n XcursorTheme-whiteglass +%defattr(644,root,root,755) +%{_iconsdir}/whiteglass %files -n imake %defattr(644,root,root,755) @@ -3370,10 +3218,11 @@ fi %files -n twm %defattr(644,root,root,755) %{_wmpropsdir}/twm.desktop +%{_xsessdir}/twm.desktop %attr(755,root,root) %{_bindir}/twm %dir %{_sysconfdir}/X11/twm %config %{_sysconfdir}/X11/twm/system.twmrc -%attr(755,root,root) %{_libdir}/X11/twm +%attr(755,root,root) %{_libx11dir}/twm %{_mandir}/man1/twm.1* %files -n xauth @@ -3389,14 +3238,11 @@ fi %attr(640,root,root) %config(noreplace) %verify(not md5 size mtime) /etc/sysconfig/xdm /var/lib/xdm -%{_libdir}/X11/app-defaults/Chooser +%{_appdefsdir}/Chooser -%attr(755,root,root) %{_libdir}/X11/xdm +%attr(755,root,root) %{_libx11dir}/xdm %attr(755,root,root) %{_bindir}/xdm %attr(755,root,root) %{_bindir}/chooser -%ifarch alpha -%attr(755,root,root) %{_libdir}/libXdmGreet.so* -%endif %{_mandir}/man1/xdm.1* %dir /etc/X11/xdm @@ -3417,7 +3263,7 @@ fi %attr(754,root,root) /etc/rc.d/init.d/xfs %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 +%attr(755,root,root) %{_libx11dir}/fs %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/fs/config %attr(755,root,root) %{_bindir}/xfs