#
%define _sver %(echo %{version} | tr -d .)
-%define _synaptics_ver 0.11.3p3
+%define _synaptics_ver 0.11.3p11
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.3.99.7
+Version: 4.3.99.12
Release: 0.1
License: MIT
Group: X11/XFree86
Source0: ftp://ftp.xfree86.org/pub/XFree86/develsnaps/%{name}-%{version}.tar.bz2
-# Source0-md5: 1aba2fcb679201305a3b710efeb27de9
+# Source0-md5: 12820de14d53c61cc84a0f20109f1743
#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
#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: 5541058365fc13ba28d2a74ed0b6fdd7
+# Source40-md5: 4dabd4c8ce8968eba6cde1dd6265c9c7
+Source41: http://www.linux.org.uk/~alan/S3.zip
+# Source41-md5: 8b754fc6bbded60b683563b945e384b0
Patch0: %{name}-PLD.patch
Patch1: %{name}-HasZlib.patch
Patch2: %{name}-DisableDebug.patch
Patch22: %{name}-neomagic_swcursor.patch
Patch23: %{name}-mga-busmstr.patch
Patch24: %{name}-agpgart-load.patch
-Patch25: %{name}-mkfontdir-chmod_644.patch
Patch26: %{name}-HasFreetype2.patch
Patch27: %{name}-config-s3.patch
Patch28: %{name}-sparc_pci_domains.patch
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
# Small (maybe buggy) patch to resolve problems with totem 0.97.0
Patch46: %{name}-lock.patch
Patch47: %{name}-linux-version.patch
-Patch48: %{name}-XF86_VERSION_SNAP.patch
+Patch48: %{name}-new-s3-nodebug.patch
URL: http://www.xfree86.org/
+BuildRequires: %{_bindir}/perl
BuildRequires: bison
+BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: freetype-devel >= 2.0.0
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: %{_bindir}/perl
BuildRequires: tcl-devel
BuildRequires: utempter-devel
BuildRequires: zlib-devel
-BuildRequires: ed
%ifarch %{ix86} alpha
%{!?_without_tdfx:BuildRequires: Glide3-DRI-devel}
%endif
%ifarch %{ix86}
%{!?_without_tdfx:BuildRequires: Glide2x_SDK}
%endif
-BuildConflicts: flex >= 2.5.31
-Requires: xauth
Requires: %{name}-libs = %{version}
+Requires: xauth
ExclusiveArch: %{ix86} alpha sparc m68k armv4l noarch ppc
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
Obsoletes: xpm-progs
wy¶wietlania informacji na ekranie.
%package DPS-devel
-Summary: Display PostScript
-Summary(pl): Display PostScript
+Summary: Header files for Display PostScript
+Summary(pl): Pliki nag³ówkowe dla Display PostScript
Group: X11/XFree86
Requires: %{name}-DPS = %{version}
Obsoletes: dgs-devel
Pliki nag³ówkowe biblioteki X-Window Display PostScript.
%package DPS-static
-Summary: Display PostScript
-Summary(pl): Display PostScript
+Summary: Display PostScript static libraries
+Summary(pl): Biblioteki statyczne Display PostScript
Group: X11/XFree86
Requires: %{name}-DPS-devel = %{version}
Obsoletes: dgs-static
%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: X Font Rendering library
-Summary(pl): Biblioteka 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 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 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
-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 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
Summary: OpenGL for X11R6 development
Summary(pl): Pliki nag³ówkowe OpenGL dla systemu X11R6
Group: X11/Development/Libraries
+Requires: OpenGL-devel-base
Requires: %{name}-OpenGL-libs = %{version}
Requires: %{name}-devel
-Requires: OpenGL-devel-base
Provides: OpenGL-devel
Obsoletes: Mesa-devel
-Obsoletes: glxMesa-devel
Obsoletes: XFree86-OpenGL-doc
+Obsoletes: glxMesa-devel
%description OpenGL-devel
Headers and man pages for OpenGL for X11R6.
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: OpenGL-devel
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.
Summary: OpenGL libraries for X11R6
Summary(pl): Biblioteki OpenGL dla systemu X11R6
Group: X11/Libraries
-Requires: %{name}-libs = %{version}
Requires: %{name}-OpenGL-core
+Requires: %{name}-libs = %{version}
Provides: OpenGL
Obsoletes: %{name}-OpenGL
Obsoletes: Mesa
Summary(ru): "÷ÌÏÖÅÎÎÙÊ" ÓÅÒ×ÅÒ XFree86
Summary(uk): "÷ËÌÁÄÅÎÉÊ" ÓÅÒ×ÅÒ XFree86
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: XFree86-fonts-base
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-fonts-base
%description Xnest
Xnest is an X Window System server which runs in an X window. Xnest is
Summary: X print server
Summary(pl): X serwer z rozszerzeniem Xprint
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: XFree86-fonts-base
PreReq: xprint-initrc
+Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-fonts-base
%description Xprt
Xprt provides an X server with the print extension and special DDX
Summary(pl): Serwer XFree86
Summary(tr): XFree86 sunucusu
Group: X11/XFree86/Servers
-Requires: pam
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: XFree86-fonts-base
-Obsoletes: XFree86-VGA16 XFree86-SVGA XFree86-Mono
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-fonts-base
+Requires: pam
+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
Summary(ru): óÅÒ×ÅÒ XFree86 ÄÌÑ ×ÉÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Summary(uk): óÅÒ×ÅÒ XFree86 ÄÌÑ ×¦ÒÔÕÁÌØÎÏÇÏ ÆÒÅÊÍÂÕÆÅÒÁ
Group: X11/XFree86/Servers
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-common /usr/X11R6/lib/X11/rgb.txt
-Requires: XFree86-fonts-base
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-fonts-base
%description Xvfb
Xvfb (X Virtual Frame Buffer) is an X Window System server that is
Group: X11/Development/Libraries
Requires: %{name}-libs = %{version}
Requires: imake = %{version}
-Obsoletes: xpm-devel
Provides: xpm-devel
+Obsoletes: xpm-devel
%ifarch sparc sparc64
Obsoletes: X11R6.1-devel
%endif
Summary: Alliance Promotion video driver
Summary(pl): Sterownik do kart Alliance Promotion
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Alliance
%description driver-apm
Summary: Ark Logic video driver
Summary(pl): Sterownik do kart Ark Logic
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-ark
Ark Logic driver.
Summary: ATI video driver
Summary(pl): Sterownik do kart ATI
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Requires: %{name}-modules = %{version}-%{release}
+Obsoletes: XFree86-ATI
+Obsoletes: XFree86-Mach32
+Obsoletes: XFree86-Mach64
%description driver-ati
ATI video driver.
Summary: ATI Rage 128 video driver
Summary(pl): Sterownik do kart ATI Rage 128
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: XFree86-driver-ati
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-driver-ati
Conflicts: XFree86-driver-nvidia
%description driver-radeon
Summary: ATI video driver (ATI.2)
Summary(pl): Sterownik do kart ATI (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
-Obsoletes: XFree86-ATI XFree86-Mach32 XFree86-Mach64
+Requires: %{name}-modules = %{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/).
Summary: ATI Rage 128 video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Rage 128 (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
-Requires: XFree86-driver-ati.2
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-Rage128
Summary: ATI Radeon video driver (ATI.2)
Summary(pl): Sterownik do kart ATI Radeon (ATI.2)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: XFree86-driver-ati.2
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
+Requires: %{name}-driver-ati.2
Conflicts: XFree86-driver-nvidia
%description driver-radeon.2
Summary: Chips and Technologies video driver
Summary(pl): Sterownik do kart na uk³adach Chips and Technologies
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-ChipsTechnologies
%description driver-chips
Summary: Cirrus Logic video driver
Summary(pl): Sterownik do kart Cirrus Logic
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Cirrus
%description driver-cirrus
Summary: Cyrix video driver
Summary(pl): Sterownik do grafiki na uk³adzie Cyrix MediaGX
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Cyrix
%description driver-cyrix
Summary: Video driver for framebuffer device
Summary(pl): Sterownik korzystaj±cy z framebuffera
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-FBDev
%description driver-fbdev
Summary: Video driver for DRI sparc framebuffer device
Summary(pl): Sterownik do framebuffera DRI na sparc
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-ffb
Video driver for DRI sparc framebuffer device.
Summary: 3Dfx Voodoo1 and Voodoo2 video driver
Summary(pl): Sterownik do kart 3Dfx Voodoo1 i Voodoo2
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-glide
Voodoo1 and Voodoo2 video driver.
Summary: GLINT/Permedia video driver
Summary(pl): Sterownik do kart GLINT i Permedia
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3DLabs
Summary: Number 9 I128 video driver
Summary(pl): Sterownik do kart Number 9 I128
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-I128
%description driver-i128
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-i740
%description driver-i740
Summary: Intel i810/i815/i830 video driver
Summary(pl): Sterownik do grafiki na uk³adach Intel i810/i815/i830
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-i810
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}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-imstt
Integrated Micro Solutions Twin Turbo 128 driver.
Summary: Matrox video driver
Summary(pl): Sterownik do kart Matrox
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-mga
Summary: NeoMagic video driver
Summary(pl): Sterownik do kart NeoMagic
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-NeoMagic
%description driver-neomagic
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}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-newport
Newport (XL) adapters video driver (found primarily in SGI Indy and
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}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-nsc
National Semiconductors GEODE family video driver. Supports GXLV (5530
Summary: nVidia video driver
Summary(pl): Sterownik do kart na uk³adach firmy nVidia
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-NVidia
%description driver-nv
Summary: Rendition video driver
Summary(pl): Sterownik do kart Rendition
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Rendition
%description driver-rendition
Summary: S3 ViRGE/Trio3D video driver
Summary(pl): Sterownik do kart na uk³adach S3 ViRGE i Trio3D
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-S3V
%description driver-s3virge
Summary: S3 Trio video driver
Summary(pl): Sterownik do kart na uk³adach S3 Trio
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-S3
%description driver-s3
Summary: S3 Savage video driver
Summary(pl): Sterownik do kart na uk³adach S3 Savage
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-savage
S3 Savage video driver.
Summary: Silicon Motion video driver
Summary(pl): Sterownik do kart na uk³adach Silicon Motion
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-siliconmotion
Silicon Motion video driver.
Summary: SiS video driver
Summary(pl): Sterownik do kart na uk³adach SiS
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-SiS
%description driver-sis
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-SunMono
%description driver-sunbw2
Summary: suncg14 - Sun CG14 video driver
Summary(pl): Sterownik do kolorowego framebuffera CG14 na Sunie
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-suncg14
suncg14 - Sun CG14 video driver.
Summary: suncg3 - Sun CG3 video cards driver
Summary(pl): Sterownik do kolorowego framebuffera CG3 na Sunie
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-suncg3
suncg3 - Sun CG3 video cards driver.
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}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-suncg6
suncg6 - Sun GX and Turbo GX video driver.
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}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-sunffb
sunffb - Sun Creator, Creator 3D and Elite 3D video cards driver.
Summary: sunleo - Sun Leo (ZX) video cards driver
Summary(pl): Sterownik do kart Sun Leo (ZX)
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-sunleo
sunleo - Sun Leo (ZX) video cards driver.
Summary: suntcx - Sun TCX video cards driver
Summary(pl): Sterownik do kart Sun TCX
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-suntcx
suntcx - Sun TCX video cards driver.
Summary: 3Dfx video driver
Summary(pl): Sterownik do kart 3Dfx
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
-Requires: %{name}-Xserver = %{version}-%{release}
-Requires: OpenGL
Requires: Glide3-DRI
+Requires: OpenGL
+Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Conflicts: XFree86-driver-nvidia
Obsoletes: XFree86-3dfx
Summary: TGA video driver
Summary(pl): Sterownik do kart TGA
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-TGA
%description driver-tga
Summary: Trident video driver
Summary(pl): Sterownik do kart Trident
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Trident
%description driver-trident
Summary: Tseng Labs video driver
Summary(pl): Sterownik do kart Tseng Labs
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
Obsoletes: XFree86-Tseng XFree86-W32
%description driver-tseng
Summary: VIA CLE266 driver
Summary(pl): Sterownik do kart VIA CLE266
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-via
VIA CLE266 driver.
Summary: VMWare SVGA emulated video driver
Summary(pl): Sterownik do emulacji karty SVGA dostêpnej pod VMware
Group: X11/XFree86
-Requires: %{name}-modules = %{version}-%{release}
Requires: %{name}-Xserver = %{version}-%{release}
+Requires: %{name}-modules = %{version}-%{release}
%description driver-vmware
VMware emulated SVGA video driver. Necessary if you run Linux on
Requires(post,postun): grep
Requires(postun): fileutils
Requires: %{name}-common = %{version}
-Obsoletes: xpm
Provides: xpm
+Obsoletes: xpm
%ifarch sparc sparc64
Obsoletes: X11R6.1-libs
Summary(uk): ò¦ÚÎÏÍÁΦÔΦ ÕÔÉ̦ÔÉ ÄÌÑ XFree86
Group: X11/XFree86
Requires: %{name} >= %{version}
-Requires: XFree86-libs = %{version}
+Requires: %{name}-libs = %{version}
Requires: man-config
Obsoletes: X11R6-contrib
Summary(ru): ðÒÏÓÔÏÊ ÏËÏÎÎÙÊ ÍÅÎÅÄÖÅÒ
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
-Requires: XFree86-libs = %{version}
+Requires: %{name}-libs = %{version}
%description -n twm
Twm is a window manager for the X Window System. It provides
Summary(ru): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÑ X
Summary(uk): íÅÎÅÄÖÅÒ ÄÉÓÐÌÅÀ X
Group: X11/XFree86
+PreReq: rc-scripts
+Requires(post,preun): /sbin/chkconfig
Requires: %{name} = %{version}
-Requires: pam >= 0.71
Requires: %{name}-libs = %{version}
+Requires: /usr/X11R6/bin/sessreg
+Requires: pam >= 0.71
Requires: sessreg = %{version}
Requires: /usr/X11R6/bin/sessreg
Provides: XDM
-PreReq: chkconfig
Obsoletes: XFree86-xdm
Obsoletes: gdm
Obsoletes: kdm
Summary(ru): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Summary(uk): æÏÎÔÓÅÒ×ÅÒ ÄÌÑ X Window System
Group: X11/XFree86
-Requires: %{name}-libs = %{version}
-Requires: XFree86-fonts-base
-PreReq: chkconfig
+PreReq: rc-scripts
Requires(pre): /bin/id
Requires(pre): /usr/bin/getgid
Requires(pre): /usr/sbin/useradd
Requires(pre): /usr/sbin/groupadd
+Requires(post,preun): /sbin/chkconfig
Requires(postun): /usr/sbin/groupdel
Requires(postun): /usr/sbin/userdel
+Requires: %{name}-fonts-base
+Requires: %{name}-libs = %{version}
Obsoletes: xfsft XFree86-xfs
%description -n xfs
#--- %prep ---------------------------
%prep
-%setup -q -c -b3 -a40
+%setup -q -c -b3 -a40 -a41
#-b1 -b2 -a3
%patch0 -p0
%patch1 -p1
%patch22 -p1
%patch23 -p1
%patch24 -p1
-%patch25 -p1
%patch26 -p1
%patch27 -p1
%ifarch sparc sparc64
#%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
%patch45 -p1
%patch46 -p0
%patch47 -p1
+tar xfz *.tar.gz
%patch48 -p0
rm -f xc/config/cf/host.def
#--- %build --------------------------
%build
-%{__make} -S -C xc World DEFAULT_OS_CPU_FROB=%{_target_cpu} \
+%{__make} -S -C xc World \
+ DEFAULT_OS_CPU_FROB=%{_target_cpu} \
CC="%{__cc}" \
BOOTSTRAPCFLAGS="%{rpmcflags}" \
CCOPTIONS="%{rpmcflags}" \
# "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=$(pwd)/../xc \
- CC="%{__cc}" \
- BOOTSTRAPCFLAGS="%{rpmcflags}" \
- CCOPTIONS="%{rpmcflags}" \
- CXXOPTIONS="%{rpmcflags}" \
- CXXDEBUGFLAGS="" \
- CDEBUGFLAGS="" \
- ICONDIR="%{_icondir}" \
- LINUXDIR="%{_kernelsrcdir}"
+ 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 ------------------------
$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},%{_pixmapsdir}/mini} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce}}
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
ICONDIR="%{_icondir}" \
LINUXDIR="%{_kernelsrcdir}"
-install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input/
+%ifnarch sparc sparc64
+install synaptics/synaptics_drv.o $RPM_BUILD_ROOT%{_libdir}/modules/input
+%endif
%ifnarch alpha
#install -d $RPM_BUILD_ROOT%{_libdir}/modules.gatos/{drivers,dri}
# $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
+
# setting default X
rm -f $RPM_BUILD_ROOT%{_bindir}/X
ln -sf XFree86 $RPM_BUILD_ROOT%{_bindir}/X
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} \
+ $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE30} %{SOURCE31} %{SOURCE32} %{SOURCE33} %{SOURCE34} \
+ %{SOURCE35} %{SOURCE36} %{SOURCE37} \
$RPM_BUILD_ROOT%{_pixmapsdir}
bzip2 -dc %{SOURCE38} | tar xf - -C $RPM_BUILD_ROOT%{_mandir}
# 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 \
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}/
+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}/*
#--- %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 xft -p /sbin/ldconfig
-%postun xft -p /sbin/ldconfig
+%post DPS -p /sbin/ldconfig
+%postun DPS -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-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
echo "found"
fi
+%pre modules
+if [ -d /etc/X11/xkb/geometry/hp ]; then
+ rm -rf /etc/X11/xkb/geometry/hp
+fi
+
%triggerpostun modules -- XFree86-modules < 4.0.2
if [ -d /usr/X11R6/lib/X11/xkb ]; then
rm -rf /usr/X11R6/lib/X11/xkb
/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
%attr(755,root,root) %{_bindir}/makestrs
%attr(755,root,root) %{_bindir}/mergelib
%attr(755,root,root) %{_bindir}/mkdirhier
-%attr(755,root,root) %{_bindir}/mkfontdir
-%attr(755,root,root) %{_bindir}/mkfontscale
%attr(755,root,root) %{_bindir}/mkhtmlindex
%attr(755,root,root) %{_bindir}/proxymngr
%attr(755,root,root) %{_bindir}/resize
%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
%{_includedir}/X11/bitmaps
%{_includedir}/X11/pixmaps
-%{_applnkdir}/Utilities/xconsole.desktop
-%{_applnkdir}/Terminals/*
+%{_desktopdir}/xconsole.desktop
+%{_desktopdir}/xterm.desktop
+%{_pixmapsdir}/xconsole.png
+%{_pixmapsdir}/xlogo64.png
+%{_pixmapsdir}/xterm.png
+
%{_libdir}/X11/app-defaults/Xvidtune
-%{_pixmapsdir}/x*
%{_mandir}/man1/Xmark.1*
%{_mandir}/man1/appres.1*
%{_mandir}/man1/makeg.1*
%{_mandir}/man1/mergelib.1*
%{_mandir}/man1/mkdirhier.1*
-%{_mandir}/man1/mkfontdir.1*
-%{_mandir}/man1/mkfontscale.1*
%{_mandir}/man1/mkhtmlindex.1*
%{_mandir}/man1/proxymngr.1*
%{_mandir}/man1/resize.1*
%lang(pl) %{_mandir}/pl/man1/xinit.1*
%lang(pl) %{_mandir}/pl/man1/xwd.1*
+# to be separated
+%attr(755,root,root) %{_bindir}/fonttosfnt
+%attr(755,root,root) %{_bindir}/mkfontdir
+%attr(755,root,root) %{_bindir}/mkfontscale
+%{_mandir}/man1/fonttosfnt.1*
+%{_mandir}/man1/mkfontdir.1*
+%{_mandir}/man1/mkfontscale.1*
+
%files common
%defattr(644,root,root,755)
/usr/bin/X11
%{_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
%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
%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
%{_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*
+%{_desktopdir}/oclock.desktop
+%{_desktopdir}/xclipboard.desktop
+%{_desktopdir}/xclock.desktop
+%{_desktopdir}/xedit.desktop
+%{_desktopdir}/xeyes.desktop
+%{_pixmapsdir}/oclock.png
+%{_pixmapsdir}/xclipboard.png
+%{_pixmapsdir}/xclock.png
+%{_pixmapsdir}/xedit.png
+%{_pixmapsdir}/xeyes.png
%files -n imake
%defattr(644,root,root,755)