-# _without_tdfx disables tdfx build
+# TODO:
+# - separate XFS to be standalone - is it possible without duplicated files?
+
+#
+# Conditional build:
+# _without_tdfx - disables tdfx drivers building
+#
%define _sver %(echo %{version} | tr -d .)
+%define _synaptics_ver 0.11.3p2
Summary: XFree86 Window System servers and basic programs
Summary(de): Xfree86 Window-System-Server und grundlegende Programme
Summary(uk): âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
Summary(zh_CN): XFree86 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: XFree86
-Version: 4.2.99.3
-Release: 0.1
+Version: 4.3.99.6
+Release: 1
License: MIT
Group: X11/XFree86
-#Source0: ftp://ftp.xfree86.org/pub/XFree86/4.2.0/source/X420src-1.tgz
-Source0: X42993src-1.tar.bz2
-Source1: ftp://ftp.pld.org.pl/software/xinit/xdm-xinitrc-0.2.tar.bz2
-Source2: cvs://anonymous@cvs.gatos.sourceforge.net/cvsroot/gatos/ati.2-20021001.tar.bz2
-Source3: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-Xman-pages.tar.bz2
+Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
+# Source0-md5: 1aba2fcb679201305a3b710efeb27de9
+#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
+# Source3-md5: 0a15b1c374256b5cad7961807baa3896
Source4: xdm.pamd
Source5: xserver.pamd
Source6: xdm.init
Source35: xclock.png
Source36: oclock.png
Source37: xconsole.png
-Source38: http://www.winischhofer/sis/sis_drv_src_141202-1.tar.gz
+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
+# Source39-md5: 8d43c01d364576c195a5294279f92566
+# http://w1.894.telia.com/~u89404340/touchpad/index.html
+Source40: http://w1.894.telia.com/~u89404340/touchpad/synaptics-%{_synaptics_ver}.tar.bz2
+# Source40-md5: 2898f128f1e40dd29f3af38ce7550aae
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
Patch29: %{name}-XTerm.ad.patch
-Patch30: %{name}-dri_directory_mode_fix.patch
-Patch31: %{name}-alpha_GLX_align_fix.patch
-Patch32: %{name}-XftConfig_in_correct_place.patch
-Patch33: %{name}-PEX+XIE.patch
-Patch34: %{name}-xman-manpaths.patch
-Patch35: %{name}-ppc_drivers.patch
-Patch36: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/patches/4.2.0-4.2.1.diff.gz
-Patch37: %{name}-clearrts.patch
-Patch38: %{name}-mga020414.patch
-Patch39: %{name}-trident-9397.patch
-Patch40: %{name}-4.2.0-i810-driver-update-cvs-20020617.patch.bz2
-Patch41: %{name}-nv020414.patch
-Patch42: %{name}-fix-07-s3trio64v2gx+netfinity.patch
-Patch43: %{name}-prosavage.patch
-Patch44: %{name}-xtt-null-pointer.patch
-Patch45: %{name}-i740-driver-update-cvs-20020617.patch
-Patch46: %{name}-neomagic-Xv-support.patch
-Patch47: %{name}-tdfx-disable-dri-on-16Mb-cards-in-hires.patch
-Patch48: %{name}-tdfx-should-be-2048-not-2046.patch
-Patch49: %{name}-tdfx-interlace.patch
-Patch50: %{name}-tdfx-fix-compiler-warnings.patch
-Patch51: %{name}-tdfx-fix-vtswitch-font-corruption.patch
-Patch52: %{name}-sis-option-swcursor.patch
-Patch53: %{name}-sis-unresolved-symbols.patch
-Patch54: %{name}-sis-maxxfbmem-fixup.patch
-Patch55: %{name}-Radeon9000.patch
-Patch56: %{name}-Xfont-Type1-large-DoS.patch
-# "strip -g libGLcore.a" left empty object debug_xform.o, which caused GLcore
-# loading failure with "debug_xform.o: no symbols"
-Patch57: %{name}-GLcore-strip-a-workaround.patch
-# Original from: ftp://ftp.xfree86.org/pub/XFree86/4.2.1/fixes/4.2.1-mit-shm-security.patch
-Patch58: %{name}-4.2.1-mit-shm-security.patch
-Patch59: %{name}-disable_glide.patch
+Patch30: %{name}-alpha_GLX_align_fix.patch
+Patch32: %{name}-xman-manpaths.patch
+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
+Patch37: %{name}-tdfx-interlace.patch
+Patch38: %{name}-tdfx-fix-compiler-warnings.patch
+Patch39: %{name}-tdfx-fix-vtswitch-font-corruption.patch
+Patch40: %{name}-Xfont-Type1-large-DoS.patch
+# "strip -g libGLcore.a" leaves empty objects m_debug_*.o, which cause
+# warnings during GLcore loading ("m_debug_*.o: no symbols") - shut up them
+Patch41: %{name}-GLcore-strip-a-workaround.patch
+Patch42: %{name}-disable_glide.patch
+Patch43: %{name}-expat.patch
+Patch44: %{name}-pkgconfig.patch
+Patch45: %{name}-VidMode-nocrashafterfailure.patch
+# spencode.o in libspeedo.a is empty - patch like for libGLcore.a
+Patch46: %{name}-spencode-nowarning.patch
+# Small (maybe buggy) patch to resolve problems with totem 0.97.0
+Patch47: %{name}-lock.patch
+#Patch48: %{name}-savage-20030505.patch
+URL: http://www.xfree86.org/
BuildRequires: bison
+BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
-BuildRequires: gcc-c++
+BuildRequires: libpng-devel
+BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: perl
+BuildRequires: %{_bindir}/perl
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-BuildRequires: libstdc++-devel
+BuildRequires: ed
%ifarch %{ix86} alpha
%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _wmpropsdir %{_datadir}/wm-properties
+%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
# 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
%description
-If you want to install the X Window System (TM) on your machine,
-you'll need to install XFree86.
-
The X Window System provides the base technology for developing
graphical user interfaces. Simply stated, X draws the elements of the
GUI on the user's screen and builds methods for sending user
%description DPS-static -l pl
Statyczne biblioteki X-Window Display PostScript.
-%package PEX
-Summary: PEX extension library
-Summary(pl): Biblioteka rozszerzenia PEX
+%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}
+Obsoletes: XFree86-xft < 4.2.99
-%description PEX
-PEX extension library. Since XFree86 4.2.0 it's no longer included by
-default.
-
-%description PEX -l pl
-Biblioteka rozszerzenia PEX. Od wersji XFree86 4.2.0 nie jest ju¿
-do³±czane domy¶lnie.
-
-%package PEX-devel
-Summary: PEX extension headers
-Summary(pl): Pliki nag³ówkowe rozszerzenia PEX
-Group: X11/XFree86
-Requires: %{name}-PEX = %{version}
-
-%description PEX-devel
-PEX extension headers.
-
-%description PEX-devel -l pl
-Pliki nag³ówkowe rozszerzenia PEX.
-
-%package PEX-static
-Summary: PEX extension static library
-Summary(pl): Statyczna biblioteka rozszerzenia PEX
-Group: X11/XFree86
-Requires: %{name}-PEX-devel = %{version}
-
-%description PEX-static
-PEX extension static library.
+%description xft1
+Old version of font rendering library.
-%description PEX-static -l pl
-Statyczna biblioteka rozszerzenia PEX.
+%description xft1 -l pl
+Stara wersja biblioteki wy¶wietlaj±cej fonty.
%package xft
-Summary: Font rendering library
-Summary(pl): Biblioteka wy¶wietlaj±ca fonty
+Summary: X Font rendering library
+Summary(pl): Biblioteka do renderowania fontów
Group: X11/XFree86
Requires: %{name}-libs = %{version}
+Requires: %{name}-fontconfig = %{version}
+Provides: Xft = 2.1-2
+Obsoletes: XFree86-xft2
+Obsoletes: Xft
%description xft
-Font rendering library.
+Xft is a font rendering library for X.
%description xft -l pl
-Biblioteka wy¶wietlaj±ca fonty.
+Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
%package xft-devel
-Summary: Xft font rendering library headers
-Summary(pl): Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty
-Group: X11/XFree86
+Summary: X Font Rendering library
+Summary(pl): Biblioteka do renderowania fontów
+Group: X11/Development/Libraries
Requires: %{name}-xft = %{version}
-Requires: %{name}-devel = %{version}
+Requires: %{name}-fontconfig-devel
+Provides: Xft-devel = 2.1-2
+Obsoletes: XFree86-xft2-devel
+Obsoletes: Xft-devel
%description xft-devel
-Xft font rendering library headers.
+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
-Pliki nag³ówkowe biblioteki Xft wy¶wietlaj±cej fonty.
+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: Xft font rendering static library
-Summary(pl): Statyczna biblioteka Xft wy¶wietlaj±ca fonty
-Group: X11/XFree86
+Summary: X Font Rendering library
+Summary(pl): 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 font rendering static library.
+Xft is a font rendering library for X.
+
+This package contains static libraries.
%description xft-static -l pl
-Statyczna biblioteka Xft wy¶wietlaj±ca fonty.
+Xft jest bibliotek± s³u¿±c± do renderowania fontów dla X Window.
-%package XIE
-Summary: XIE extension library
-Summary(pl): Biblioteka rozszerzenia XIE
-Group: X11/XFree86
+Ten pakiet zawiera biblioteki statyczne.
+
+%package fontconfig
+Summary: Font configuration and customization library
+Summary(pl): Biblioteka do konfigurowania fontów
+Requires: %{name}-libs = %{version}
+Group: Libraries
+Requires(post): /sbin/ldconfig
+Provides: fontconfig = 1.0.1
+Provides: %{name}-fontconfig-realpkg = %{version}
+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: Font configuration and customization library
+Summary(pl): Biblioteka do konfigurowania fontów
+Group: Development/Libraries
+Requires: %{name}-fontconfig-realpkg = %{version}
+Requires: freetype-devel
+Provides: fontconfig-devel = 1.0.1
+Provides: %{name}-fontconfig-devel-realpkg = %{version}
+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 library
+Summary(pl): 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 XIE
-XIE (X Image Extension) extension library. Since XFree86 4.2.0 it's no
-longer included by default.
+%description xrender
+X render library.
-%description XIE -l pl
-Biblioteka rozszerzenia XIE (X Image Extension). Od wersji XFree86
-4.2.0 nie jest ju¿ do³±czane domy¶lnie
+%description xrender -l pl
+Biblioteka X render.
-%package XIE-devel
-Summary: XIE extension headers
-Summary(pl): Pliki nag³ówkowe rozszerzenia XIE
-Group: X11/XFree86
-Requires: %{name}-XIE = %{version}
+%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 XIE-devel
-XIE extension headers.
+%description xrender-devel
+X render library headers.
-%description XIE-devel -l pl
-Pliki nag³ówkowe rozszerzenia XIE.
+%description xrender-devel -l pl
+Pliki nag³ówkowe biblioteki X render.
-%package XIE-static
-Summary: XIE extension static library
-Summary(pl): Statyczna biblioteka rozszerzenia XIE
-Group: X11/XFree86
-Requires: %{name}-XIE-devel = %{version}
+%package xrender-static
+Summary: X Render static library
+Summary(pl): Biblioteka statyczna X render
+Group: X11/Libraries/Development
+Requires: %{name}-xrender-devel = %{version}
-%description XIE-static
-XIE extension static library.
+%description xrender-static
+X render static library.
-%description XIE-static -l pl
-Statyczna biblioteka rozszerzenia XIE.
+%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
%package OpenGL-devel
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
+Requires: OpenGL-devel-base
Provides: OpenGL-devel
Obsoletes: Mesa-devel
Obsoletes: glxMesa-devel
%description OpenGL-devel -l pl
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)
+Group: X11/Development/Libraries
+Requires: %{name}-OpenGL-libs = %{version}
+Requires: %{name}-devel
+Provides: OpenGL-devel-base
+Requires: OpenGL-devel
+
+%description OpenGL-devel-base
+Base headers (only gl?.h) for OpenGL for X11R6.
+
+%description OpenGL-devel-base -l pl
+Podstawowe pliki nag³ówkowe (tylko gl?.h) OpenGL dla systemu X11R6.
+
%package OpenGL-libs
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
%package OpenGL-static
Summary: X11R6 static libraries with OpenGL
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{version}
Provides: OpenGL-static
Obsoletes: Mesa-static
Summary(ru): âÉÂÌÉÏÔÅËÉ ÒÁÚÒÁÂÏÔÞÉËÁ, ÈÅÄÅÒÁ É ÄÏËÕÍÅÎÔÁÃÉÑ ÐÏ ÐÒÏÇÒÁÍÍÉÒÏ×ÁÎÉÀ X11R6
Summary(tr): X11R6 ile geliþtirme için gerekli dosyalar
Summary(uk): â¦Â̦ÏÔÅËÉ ÐÒÏÇÒÁͦÓÔÁ, ÈÅÄÅÒÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÐÏ ÐÒÏÇÒÁÍÕ×ÁÎÎÀ X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}
Requires: imake = %{version}
Obsoletes: xpm-devel
÷ÓÔÁÎÏצÔØ XFree86-devel ÑËÝÏ ×É ÚÂÉÒÁ¤ÔÅÓØ ÒÏÚÒÏÂÌÑÔÉ ÐÒÏÇÒÁÍÉ, Ñ˦
ÂÕÄÕÔØ ÐÒÁÃÀ×ÁÔÉ ÑË X-Ë̦¤ÎÔÉ.
+%package Xserver-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}
+
+%description Xserver-devel
+Header files for XFree86 Xserver drivers and extensions development.
+
+%description Xserver-devel -l pl
+Pliki nag³ówkowe do tworzenia sterowników i rozszerzeñ X serwera
+XFree86.
+
%package driver-apm
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
%description driver-ati.2
-ATI video driver (ATI.2) from gatos
-(http://gatos.sourceforge.net/).
+ATI video driver (ATI.2) from gatos (http://gatos.sourceforge.net/).
%description driver-ati.2 -l pl
Sterownik do kart ATI (ATI.2) projektu gatos
%description driver-i810 -l pl
Sterownik do grafiki na uk³adach Intel i810/i815/i830.
+%package driver-imstt
+Summary: Integrated Micro Solutions Twin Turbo 128 driver
+Summary(pl): Sterownik do kart Integrated Micro Solutions Twin Turbo 128
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+
+%description driver-imstt
+Integrated Micro Solutions Twin Turbo 128 driver.
+
+%description driver-imstt -l pl
+Sterownik do kart Integrated Micro Solutions Twin Turbo 128.
+
%package driver-mga
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
%description driver-neomagic -l pl
Sterownik do kart NeoMagic.
+%package driver-newport
+Summary: Newport (XL) adapters video driver
+Summary(pl): Sterownik do kart Newport (XL)
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+
+%description driver-newport
+Newport (XL) adapters video driver (found primarily in SGI Indy and
+Indigo2 machines).
+
+%description driver-newport -l pl
+Sterownik do kart Newport (XL) (wystêpuj±cych g³ównie w komputerach
+SGI Indy i Indigo).
+
+%package driver-nsc
+Summary: National Semiconductors GEODE family video driver
+Summary(pl): Sterownik dla kart na uk³adach z rodziny GEODE firmy National Semiconductors
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+
+%description driver-nsc
+National Semiconductors GEODE family video driver. Supports GXLV (5530
+companion chip), SC1200, SC1400 and GX2 (5535 companion chip).
+
+%description driver-nsc -l pl
+Sterownik dla kart na uk³adach z rodziny GEODE firmy National
+Semiconductors. Obs³uguje GXLV (uk³ad towarzysz±cy 5530), SC1200,
+SC1400 oraz GX2 (uk³ad towarzysz±cy 5535).
+
%package driver-nv
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
%description driver-tseng -l pl
Sterownik do kart firmy Tseng Labs.
+%package driver-via
+Summary: VIA CLE266 driver
+Summary(pl): Sterownik do kart VIA CLE266
+Group: X11/XFree86
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-Xserver = %{version}-%{release}
+
+%description driver-via
+VIA CLE266 driver.
+
+%description driver-via -l pl
+Sterownik do kart VIA CLE266.
+
%package driver-vmware
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
%description modules -l pl
Wspólne dla wszystkich X serwerów modu³y rozszerzeñ.
-%package module-PEX
-Summary: PEX extension module
-Summary(pl): Modu³ rozszerzenia PEX
-Group: X11/XFree86
-Requires: %{name}-modules = %{version}
-
-%description module-PEX
-PEX extension module for X server. Since XFree86 4.2.0 it's no longer
-included by default.
-
-%description module-PEX -l pl
-Modu³ rozszerzenia PEX dla X serwera. Od wersji XFree86 4.2.0 nie jest
-ju¿ do³±czane domy¶lnie.
-
-%package module-XIE
-Summary: XIE extension module
-Summary(pl): Modu³ rozszerzenia XIE
-Group: X11/XFree86
-Requires: %{name}-modules = %{version}
-
-%description module-XIE
-XIE (X Image Extension) extension module for X server. Since XFree86
-4.2.0 it's no longer included by default.
-
-%description module-XIE -l pl
-Modu³ rozszerzenia XIE (X Image Extension) dla X serwera. Od wersji
-XFree86 4.2.0 nie jest ju¿ do³±czane domy¶lnie.
-
%package setup
Summary: Graphical configuration tool for XFree86
Summary(pl): Graficzny konfigurator dla XFree86
Summary(pl): Biblioteki statyczne X11R6
Summary(ru): óÔÁÔÉÞÅÓËÉÅ ÂÉÂÌÉÏÔÅËÉ X11R6
Summary(uk): óÔÁÔÉÞΦ ¦Â̦ÏÔÅËÉ X11R6
-Group: X11/Libraries
+Group: X11/Development/Libraries
Requires: %{name}-devel = %{version}
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
#--- %prep ---------------------------
%prep
-%setup -q -c -a1
+%setup -q -c -b3 -a40
+#-b1 -b2 -a3
%patch0 -p0
%patch1 -p1
%patch2 -p1
%patch3 -p0
%patch4 -p1
%patch5 -p0
-# not ready yet
-#%patch6 -p0
+%patch6 -p0
%patch7 -p1
%patch8 -p1
%patch9 -p1
-%patch10 -p1
-#%patch11 -p0 --seems to be obsoleted
+%patch10 -p0
+#%patch11 -p0 -- obsoleted???
%patch12 -p1
%patch13 -p1
%patch14 -p0
%patch15 -p1
%patch16 -p0
-#%patch17 -p1 -- not ready, is it required?
+#%patch17 -p1 -- not ready, is it required?
%patch18 -p1
-#%patch19 -p1
-%patch20 -p0
+#%patch19 -p1 -- maybe should be updated to allow using make -j
+%patch20 -p0
%patch21 -p1
%patch22 -p1
%patch23 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
-# needs updating (14 rejects)
-#%patch28 -p1
+#%patch28 -p1 -- needs update
%endif
%patch29 -p0
-#%patch30 -p1 -- obsoleted
-%patch31 -p1
-#%patch32 -p1 --obsoleted
-%patch33 -p0
-#%patch34 -p1 --obsoleted????????
-%ifarch ppc
-%patch35 --new version required
-%endif
-#%%{?_without_tdfx:%patch35} --same as above
-#%patch36 -p0 --obsoleted
-%patch37 -p1
-####%patch38 -p1
-#%patch39 -p1
-####%patch40 -p0
-####%patch41 -p1
-####%patch42 -p1 --obsoleted (all with ####)
-####%patch43 -p1
-####%patch44 -p1
-####%patch45 -p1
-####%patch46 -p1
-%{!?_without_tdfx:%patch47 -p0}
-#%{!?_without_tdfx:%patch48 -p0}
-%{!?_without_tdfx:%patch49 -p1}
-#%patch50 -p0
-%{!?_without_tdfx:%patch51 -p0}
-#%patch52 -p1
-#%patch53 -p1
-#%patch54 -p1
-#%patch55 -p0
-%patch56 -p1
-#%%{!?debug:%patch57 -p1} --obsoleted
-#%patch58 -p0 --obsoleted
-%{?_without_tdfx:%patch59 -p0}
+%patch30 -p1
+%patch32 -p1
+%patch33 -p1
+#%patch34 -p1 -- seems not applied (was partially in rc1??? maybe another fix present?)
+#%patch35 -p1 -- obsoleted? (but doesn't look to be applied)
+%{!?_without_tdfx:%patch36 -p0}
+%{!?_without_tdfx:%patch37 -p1}
+#%patch38 -p0 -- causing problems IIRC (but not really needed)
+%{!?_without_tdfx:%patch39 -p0}
+%patch40 -p1
+%{!?debug:%patch41 -p1}
+%{?_without_tdfx:%patch42 -p0}
+%patch43 -p0
+%patch44 -p0
+%patch45 -p1
+%patch46 -p1
+%patch47 -p0
+#%patch48 -p1 -- seems applied
rm -f xc/config/cf/host.def
+#Remove fonts dir for faster build
+# only valid for snapshots
+rm -rf xc/fonts
+
# New ATI drivers
-#%cd xc/programs/Xserver/hw/xfree86/drivers
-#%bzcat %{SOURCE2} | tar x
+# cd xc/programs/Xserver/hw/xfree86/drivers
+#%bzcat %{SOURCE39} | tar x
# ati.2 directory
-# New SiS drivers
-#%cd sis
-#%zcat %{SOURCE38} | tar x
-
#--- %build --------------------------
%build
%{__make} -S -C xc World DEFAULT_OS_CPU_FROB=%{_target_cpu} \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
+ CC="%{__cc}" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
%ifnarch alpha
#%%{__make} -C xc/programs/Xserver/hw/xfree86/drivers SUBDIRS="ati.2" Makefiles
# "CXXDEBUGFLAGS=" "CDEBUGFLAGS="
%endif
+cd synaptics
+%{__make} \
+ TOP=$(pwd)/xc \
+ CC="%{__cc}" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
+
+for f in COMPATIBILITY FEATURES INSTALL NEWS PARAMETER; do
+ cp -f ${f} ${f}.synaptics
+done
+
#--- %install ------------------------
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{X11,pam.d,rc.d/init.d,security/console.apps,sysconfig} \
+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} \
- $RPM_BUILD_ROOT%{_datadir}/{misc,sounds} \
+ $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}}
-
-%{__make} -C xc "DESTDIR=$RPM_BUILD_ROOT" \
- "DOCDIR=/usr/share/doc/%{name}-%{version}" \
- "INSTBINFLAGS=-m 755" \
- "INSTPGMFLAGS=-m 755" \
- "RAWCPP=/lib/cpp" \
- "BOOTSTRAPCFLAGS=%{rpmcflags}" \
- "CCOPTIONS=%{rpmcflags}" \
- "CXXOPTIONS=%{rpmcflags}" \
- "CXXDEBUGFLAGS=" "CDEBUGFLAGS=" \
- install install.man
+ $RPM_BUILD_ROOT{%{_pixmapsdir}/mini,%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
+
+%{__make} -C xc install install.man \
+ DESTDIR="$RPM_BUILD_ROOT" \
+ DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ INSTBINFLAGS="-m 755" \
+ INSTPGMFLAGS="-m 755" \
+ RAWCPP="/lib/cpp" \
+ BOOTSTRAPCFLAGS="%{rpmcflags}" \
+ CCOPTIONS="%{rpmcflags}" \
+ CXXOPTIONS="%{rpmcflags}" \
+ CXXDEBUGFLAGS="" \
+ CDEBUGFLAGS="" \
+ ICONDIR="%{_icondir}" \
+ LINUXDIR="%{_kernelsrcdir}"
+
+install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input/
%ifnarch alpha
#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/drivers
#install xc/programs/Xserver/hw/xfree86/drivers/ati.2/*_dri.o \
# $RPM_BUILD_ROOT%{_libdir}/modules.gatos/dri
-
%endif
# setting default X
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
+cd -
+
# set up PLD xdm config
rm -f $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/{*Console,Xaccess,Xsession,Xsetup*}
install xdm-xinitrc-*/pixmaps/* $RPM_BUILD_ROOT%{_sysconfdir}/X11/xdm/pixmaps
install %{SOURCE23} $RPM_BUILD_ROOT%{_applnkdir}/Terminals
install %{SOURCE24} %{SOURCE25} %{SOURCE26} %{SOURCE27} \
$RPM_BUILD_ROOT%{_applnkdir}/Utilities
-install %{SOURCE30} $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install %{SOURCE30} $RPM_BUILD_ROOT%{_pixmapsdir}
install %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} %{SOURCE35} \
%{SOURCE36} %{SOURCE37} \
$RPM_BUILD_ROOT%{_pixmapsdir}
-bzip2 -dc %{SOURCE3} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
+bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
-> $RPM_BUILD_ROOT/etc/security/console.apps/xserver
-> $RPM_BUILD_ROOT/etc/security/blacklist.xserver
-> $RPM_BUILD_ROOT/etc/security/blacklist.xdm
+:> $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
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}
+
# 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 \
fr ga gl he hr hu is it ja ko lt mi mk nl nn no pl pt pt_BR ro ru sk \
- sl sr sv ta th tr uk wa zh_CN zh_CN.GB2312 zh_TW.Big5 ; do
+ sl sr sv ta th tr uk wa zh_CN zh_TW ; do
install -d $RPM_BUILD_ROOT%{_datadir}/locale/${lang}/LC_MESSAGES
echo "%lang(${lang}) %{_datadir}/locale/${lang}" >> XFree86-libs.lang
done
%post DPS -p /sbin/ldconfig
%postun DPS -p /sbin/ldconfig
-%post PEX -p /sbin/ldconfig
-%postun PEX -p /sbin/ldconfig
+%post xft1 -p /sbin/ldconfig
+%postun xft1 -p /sbin/ldconfig
-%post XIE -p /sbin/ldconfig
-%postun XIE -p /sbin/ldconfig
+%post xft -p /sbin/ldconfig
+%postun xft -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
+
+%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 -n xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm restart >&2
+ echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+ echo "WARNING: it will terminate all sessions opened from xdm!" >&2
else
echo "Run \"/etc/rc.d/init.d/xdm start\" to start xdm." >&2
fi
/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)
+%doc synaptics/*.synaptics
%ifnarch sparc sparc64
%doc %{_docdir}/%{name}-%{version}
%doc %{_libdir}/X11/doc
%{_libdir}/X11/app-defaults/XTerm
%lang(pl) %{_libdir}/X11/app-defaults/pl/XTerm
%{_libdir}/X11/app-defaults/XTerm-color
-%{_libdir}/X11/icons
+%dir %{_icondir}
+%{_icondir}/*
%attr(755,root,root) %{_libdir}/X11/lbxproxy
%attr(755,root,root) %{_libdir}/X11/proxymngr
%{_libdir}/libdpstk.a
%{_libdir}/libpsres.a
-%ifnarch alpha sparc64 ia64 s390x
-%files PEX
+%files xft1
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libPEX5.so.*.*
-
-%files PEX-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libPEX5.so
-%{_includedir}/X11/PEX5
-
-%files PEX-static
-%defattr(644,root,root,755)
-%{_libdir}/libPEX5.a
-%endif
+%attr(755,root,root) %{_libdir}/libXft.so.1.1
%files xft
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so.*.*
-#%config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/X11/XftConfig
+%attr(755,root,root) %{_libdir}/libXft.so.2.1
%files xft-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXft.so
+%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 XIE
+%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}/libXIE.so.*.*
-%attr(755,root,root) %{_bindir}/xieperf
-%{_mandir}/man1/xieperf.1*
+%attr(755,root,root) %{_libdir}/libXcursor.so.*.*
-%files XIE-devel
+%files xcursor-devel
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libXIE.so
-%{_includedir}/X11/extensions/XIE*
+%attr(755,root,root) %{_bindir}/xcursor-config
+%attr(755,root,root) %{_libdir}/libXcursor.so
+%{_includedir}/X11/Xcursor
+%{_pkgconfigdir}/xcursor.pc
-%files XIE-static
+%files xcursor-static
%defattr(644,root,root,755)
-%{_libdir}/libXIE.a
+%{_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*
%attr(755,root,root) %{_libdir}/libOSMesa*.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
%{_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
+
%files OpenGL-libs
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/glxinfo
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/bdftopcf
-%attr(755,root,root) %{_bindir}/xcursor-config
%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}/libXv.so
-%attr(755,root,root) %{_libdir}/libexpat.so
%{_libdir}/libfntstubs.a
%{_libdir}/libfontenc.a
%{_libdir}/libFS.a
%{_libdir}/libI810XvMC.a
%{_libdir}/liboldX.a
%{_libdir}/libXau.a
-%{_libdir}/libXcursor.a
%{_libdir}/libXdmcp.a
%{_libdir}/libxf86config.a
%{_libdir}/libXfontcache.a
%{_includedir}/X11/extensions/XI.h
%{_includedir}/X11/extensions/XI[^E]*.h
%{_includedir}/X11/fonts
-%{_includedir}/X11/Xcursor
%{_includedir}/xf86*.h
-%{_includedir}/expat.h
%{_libdir}/X11/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]*
+%exclude %{_mandir}/man3/Xft.3*
+
+%files Xserver-devel
+%defattr(644,root,root,755)
+%{_includedir}/X11/Xserver
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-apm
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
%{_mandir}/man4/apm*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-ark
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
%endif
-%ifnarch sparc sparc64 alpha
+# Devel: sparc sparc64
+%ifarch %{ix86} mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
%{_mandir}/man4/chips*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha
%files driver-cirrus
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
%{_mandir}/man4/cirrus*
%endif
-%ifnarch sparc sparc64 alpha ppc
+%ifarch %{ix86}
%files driver-cyrix
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
%{_mandir}/man4/cyrix*
%endif
-%ifnarch alpha
+%ifarch %{ix86} 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*
%endif
-%ifnarch sparc sparc64 alpha ppc
+%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}
%files driver-glint
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
%{_mandir}/man4/glint*
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-i128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
%{_mandir}/man4/i128*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-i740
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
%{_mandir}/man4/i740*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-i810
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
%{_mandir}/man4/i810*
%endif
-%ifnarch sparc sparc64
+# Devel: %{ix86} sparc sparc64 ppc
+%if 0
+%files driver-imstt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.o
+%{_mandir}/man4/imstt.4*
+%endif
+
+%ifarch %{ix86} 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
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
+%endif
%{_mandir}/man4/mga*
%endif
-%ifnarch sparc sparc64 alpha ppc
+# Devel: sparc sparc64
+%ifarch %{ix86}
%files driver-neomagic
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
%{_mandir}/man4/neomagic*
%endif
-%ifnarch sparc sparc64
+# Devel: %{ix86} sparc sparc64
+%ifarch mips
+%files driver-newport
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
+%{_mandir}/man4/newport.4*
+%endif
+
+%ifarch %{ix86}
+%files driver-nsc
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.o
+%{_mandir}/man4/nsc.4*
+%endif
+
+# Devel: sparc sparc64
+%ifarch %{ix86} mips alpha arm
%files driver-nv
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
%{_mandir}/man4/nv*
%endif
-
%files driver-ati
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
%files driver-r128
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
%{_mandir}/man4/r128*
%files driver-radeon
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
-%ifnarch sparc sparc64
+%ifarch %{ix86} 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*
%ifnarch alpha
#%%files driver-ati.2
#%ifnarch sparc sparc64
#%attr(755,root,root) %{_libdir}/modules.gatos/dri/r128_dri.o
#%endif
-#%{_mandir}/man4/r128*
+#%%{_mandir}/man4/r128*
%endif
%ifnarch alpha
#%endif
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha
%files driver-rendition
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
%{_mandir}/man4/rendition*
%endif
-%ifnarch sparc sparc64
+# Devel: sparc sparc64
+%ifarch %{ix86} 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*
%endif
-%ifnarch sparc sparc64
+%ifarch %{ix86} mips alpha ppc arm
%files driver-s3
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
-#%{_mandir}/man4/s3*
+#%%{_mandir}/man4/s3.4*
%endif
-%ifnarch sparc sparc64
+# Devel: sparc sparc64
+%ifarch %{ix86} 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*
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
%{_mandir}/man4/siliconmotion*
%endif
-%ifnarch sparc sparc64 alpha
-#%files driver-sis
-#%defattr(644,root,root,755)
-#%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
-#%ifnarch ppc
+%ifarch %{ix86} mips ppc arm
+%files driver-sis
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
+%ifarch %{ix86}
#%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
-#%endif
-#%{_mandir}/man4/sis*
+%endif
+%{_mandir}/man4/sis*
%endif
%ifarch sparc sparc64
%{_mandir}/man4/suntcx*
%endif
-%ifnarch sparc sparc64 ppc
+%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}
+%endif
%{!?_without_tdfx:%{_mandir}/man4/tdfx*}
%endif
-%ifnarch sparc sparc64 ppc
+# Devel: sparc sparc64
+%ifarch %{ix86} alpha
%files driver-tga
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
%endif
-%ifnarch sparc sparc64 alpha
+# Devel: sparc sparc64
+%ifarch %{ix86} mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
%{_mandir}/man4/trident*
%endif
-%ifnarch sparc sparc64 alpha ppc
+%ifarch %{ix86}
%files driver-tseng
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
%{_mandir}/man4/tseng*
%endif
+%ifarch %{ix86}
+%files driver-via
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%{_mandir}/man4/via.4*
+%endif
+
+# Devel: sparc sparc64
%ifarch %{ix86}
%files driver-vmware
%defattr(644,root,root,755)
%files libs -f XFree86-libs.lang
%defattr(644,root,root,755)
+%dir %{_themesdir}
+%dir %{_themesdir}/Default
+%dir %{_themesdir}/ThinIce
%{_libdir}/X11/XErrorDB
%{_libdir}/X11/XKeysymDB
%dir %{_libdir}/X11/app-defaults
%{_libdir}/X11/locale
%dir %{_includedir}
%dir %{_includedir}/X11
-%dir %{_sbindir}
/usr/include/X11
+%dir %{_sbindir}
%dir %{_datadir}/locale
%dir %{_datadir}/misc
-%dir %{_datadir}/sounds
%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}/libS*.so.*.*
%attr(755,root,root) %{_libdir}/libx*.so.*.*
%attr(755,root,root) %{_libdir}/libXv.so.*.*
-%attr(755,root,root) %{_libdir}/libexpat.so.*.*
+
+%exclude %{_libdir}/libXrender.so.*.*
+%exclude %{_libdir}/libXcursor.so.*.*
%files modules
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/modules/*.a
%attr(755,root,root) %{_libdir}/modules/codeconv
%attr(755,root,root) %{_libdir}/modules/drivers/linux
-%ifnarch sparc sparc64
+%ifarch %{ix86} sparc sparc64 alpha ppc arm
%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
-%ifnarch alpha ppc
-%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
+%ifarch %{ix86} sparc sparc64
+%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
%endif
%dir %{_libdir}/modules/extensions
%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.a
%attr(755,root,root) %{_libdir}/X11/xserver
%dir /etc/X11/xserver
/etc/X11/xserver/SecurityPolicy
-#%{_mandir}/man1/xtr*
+#%%{_mandir}/man1/xtr*
%{_mandir}/man1/xkbcomp.1*
%{_mandir}/man4/citron*
%{_mandir}/man4/dmc.4*
%{_mandir}/man4/dynapro*
+%{_mandir}/man4/fpit.4*
+%{_mandir}/man4/js_x.4*
+%{_mandir}/man4/kbd.4*
%{_mandir}/man4/keyboard*
%{_mandir}/man4/microtouch*
-%{_mandir}/man4/mouse*
+%{_mandir}/man4/mouse-x.4*
+%{_mandir}/man4/palmax.4*
%{_mandir}/man4/penmount.4*
+%{_mandir}/man4/tek4957.4*
%{_mandir}/man4/v4l*
-%ifnarch sparc sparc64
+%ifarch %{ix86} sparc sparc64 alpha ppc arm
%{_mandir}/man4/vga*
-%ifnarch alpha ppc
-%{_mandir}/man4/vesa*
%endif
+%ifarch %{ix86} sparc sparc64
+%{_mandir}/man4/vesa*
%endif
%{_mandir}/man4/void*
%{_mandir}/man4/wacom*
%{_mandir}/man4/elographics*
%{_mandir}/man4/mutouch*
-%ifnarch alpha sparc64 ia64 s390x
-%files module-PEX
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/extensions/libpex5.a
-%endif
-
-%files module-XIE
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/extensions/libxie.a
-
%files setup
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pcitweak
%{_libdir}/libXmuu.a
%{_libdir}/libXp.a
%{_libdir}/libXpm.a
-%{_libdir}/libXrender.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
-%{_libdir}/libexpat.a
%files tools
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/fstobdf
%attr(755,root,root) %{_bindir}/mkcfm
%attr(755,root,root) %{_bindir}/xfsinfo
-#%attr(755,root,root) %{_bindir}/xftcache
%{_mandir}/man1/xfs.1*
%{_mandir}/man1/fslsfonts.1*
%{_mandir}/man1/fstobdf.1*
%{_mandir}/man1/mkcfm.1*
%{_mandir}/man1/xfsinfo.1*
-#%{_mandir}/man1/xftcache.1*
projects / packages / XFree86.git / blobdiff