# - -Xprint seem to be Xprt configuration files - if they aren't used by
# some (possibly remote) X client, merge them into -Xprt
# - where to take dtpdmd from?
-# - http://security.gentoo.org/glsa/glsa-200509-07.xml
#
# Conditional build:
%bcond_without glide # don't build glide driver
-
-#http://cambuca.ldhs.cetuc.puc-rio.br/multiuser/
+%bcond_without r300 # r300_dri.so
%bcond_with dualhead # apply dualhead patch
-%bcond_with r300 # experimental ati r300 and newer 3D support
- # see r300.sf.net or details
Summary: XOrg X11 Window System servers and basic programs
Summary(de): XOrg X11 Window-System-Server und grundlegende Programme
Summary(zh_CN): XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
Name: X11
Version: 6.9.0
-Release: 0.1
+Release: 17
Epoch: 1
License: MIT/X Consortium/BSD (see README)
Group: X11
Source51: xload.png
Source52: xmag.png
Source53: http://oss.sgi.com/projects/ogl-sample/ABI/glext.h
+Source54: XvMCConfig
# NoSource53-md5: 0c40bd4545aa630e139043c2b12f0807
+Patch0: http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-geteuid.diff
Patch1: %{name}-PLD.patch
Patch2: %{name}-enableglide.patch
Patch3: %{name}-DisableDebug.patch
Patch17: %{name}-agpgart-load.patch
Patch18: %{name}-XTerm.ad.patch
Patch19: %{name}-llh.patch
-Patch20: XFree86-xman-manpaths.patch
-Patch21: XFree86-clearrts.patch
+Patch20: %{name}-xman-manpaths.patch
+Patch21: %{name}-clearrts.patch
Patch22: XFree86-Xfont-Type1-large-DoS.patch
Patch23: %{name}-GLcore-strip-a-workaround.patch
Patch24: %{name}-pkgconfig.patch
Patch25: XFree86-spencode-nowarning.patch
Patch26: %{name}-xterm-256colors.patch
Patch27: %{name}-makefile-fastbuild.patch
+Patch28: %{name}-dri-ffb-compile.patch
Patch29: %{name}-radeon-entervt.patch
+Patch30: %{name}-acpi_event_loop_fix.patch
# updated from http://dl.sourceforge.net/i810fb/i810fb-xfree86-420.tar.bz2 : i810fb-xfree420.diff
Patch31: %{name}-i810fb.patch
-Patch33: p_i810dri-memfix.diff
-# http://lists.freedesktop.org/pipermail/xorg/2005-February/006126.html
-Patch35: %{name}-xft_memfree.patch
+# https://bugs.freedesktop.org/show_bug.cgi?id=4320
+Patch32: %{name}-compositefastpath.patch
+Patch33: ftp://ftp.x.org/pub/X11R6.9.0/patches/x11r6.9.0-mitri.diff
+Patch34: %{name}-intel.patch
+Patch35: http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-cidfonts.diff
+Patch36: %{name}-i810_945GM.patch
Patch50: %{name}-glibc-locale_sync.patch
Patch60: %{name}-oldkeyb.patch
Patch61: %{name}-sparc64-asmfix.patch
Patch62: %{name}-sparc64-v9fix.patch
Patch63: %{name}-pci-build.patch
-Patch64: %{name}-logitech-ultrax-keyboard.patch
-Patch65: %{name}-canonicalize-builderaddr.patch
-Patch66: %{name}-composite-gravity.patch
+# from http://xorg.freedesktop.org/releases/X11R6.9.0/patches/x11r6.9.0-setuid.diff, but existing chunks removed.
+Patch64: x11r6.9.0-setuid.diff
# XFree86-tdfx-fix-vtswitch-font-corruption.patch - issue still not fixed,
# but patch doesn't help either; however, it occurs in text mode only, not
# with tdfxfb, which is worth using anyway
# radeon
-Patch67: %{name}-deassert-ddc-lines.patch
-Patch68: %{name}-radeon-cursor-sync.patch
Patch69: %{name}-radeon-dynamic-clocks.patch
-Patch70: %{name}-radeon-render-byteswap.patch
Patch71: %{name}-radeon-set-fb-location.patch
-
Patch72: http://glen.alkohol.ee/xkb/xorg.patch
-Patch73: http://owczi.net/stuff/mac/%{name}R6.8.2-r128-write_depth.patch
-
-Patch74: %{name}-6.8.2-add-i945-support.patch
+Patch73: %{name}-r300.patch
+Patch74: %{name}-unichrome.patch
#head-patch
#ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
Patch100: ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/xorg-x11-6.8.1-dualhead.patch
-Patch101: %{name}-gcc4.patch
-Patch102: %{name}-r300.patch
URL: http://www.x.org/
BuildRequires: /usr/bin/perl
%{?with_glide:BuildRequires: Glide2x_SDK}
%endif
BuildRequires: bison
+BuildRequires: cpp
BuildRequires: ed
BuildRequires: expat-devel
BuildRequires: flex
BuildRequires: libstdc++-devel
BuildRequires: ncurses-devel
BuildRequires: pam-devel
-BuildRequires: rpmbuild(macros) >= 1.213
+BuildRequires: rpmbuild(macros) >= 1.268
BuildRequires: utempter-devel
BuildRequires: zlib-devel
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-xauth = %{epoch}:%{version}-%{release}
Requires: pam >= 0.79.0
+Requires: filesystem >= 2.0-1
Provides: XFree86 = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86
Obsoletes: xpm-progs
Obsoletes: xterm
-Obsoletes: XFree86
# for /usr/X11R6/bin/mkfontdir
Obsoletes: XFree86-font-utils
%ifarch sparc sparc64 sparcv9
%define _prefix /usr/X11R6
%define _mandir %{_prefix}/man
-%define _soundsdir /usr/share/sounds
-%define _wallpapersdir /usr/share/wallpapers
%define _themesdir /usr/share/themes
%define _wmpropsdir /usr/share/wm-properties
%define _xsessdir /usr/share/xsessions
-%define _wmstylesdir /etc/sysconfig/wmstyle
%define _libx11dir %{_prefix}/lib/X11
%define _appdefsdir %{_libx11dir}/app-defaults
Group: X11/Libraries
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Provides: XFree86-OpenGL-libGL = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-OpenGL-libGL
Obsoletes: X11-driver-firegl
Obsoletes: X11-driver-nvidia
+Obsoletes: XFree86-Mesa-libGL
+Obsoletes: XFree86-OpenGL-libGL
Obsoletes: XFree86-driver-firegl
Obsoletes: XFree86-driver-nvidia
Requires: %{name}-OpenGL-libs = %{epoch}:%{version}-%{release}
Requires: %{name}-devel = %{epoch}:%{version}-%{release}
Requires: OpenGL-devel-base
-Provides: OpenGL-devel = 1.5
Provides: OpenGL-GLU-devel = 1.3
Provides: OpenGL-GLX-devel = 1.4
+Provides: OpenGL-devel = 1.5
Provides: XFree86-OpenGL-devel = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-devel
Obsoletes: XFree86-OpenGL-devel
Summary(pl): Biblioteki statyczne do X11R6 ze wsparciem dla OpenGL
Group: X11/Development/Libraries
Requires: %{name}-OpenGL-devel = %{epoch}:%{version}-%{release}
-Provides: OpenGL-static = 1.5
Provides: OpenGL-GLU-static = 1.3
+Provides: OpenGL-static = 1.5
Provides: XFree86-OpenGL-static = %{epoch}:%{version}-%{release}
Obsoletes: Mesa-static
Obsoletes: XFree86-OpenGL-static
Requires: X11-fonts-base
Requires: pam >= 0.79.0
Provides: XFree86-Xserver = %{epoch}:%{version}-%{release}
-Obsoletes: XFree86-Xserver
Obsoletes: XFree86-Mono
Obsoletes: XFree86-SVGA
Obsoletes: XFree86-VGA16
Obsoletes: XFree86-Sun
Obsoletes: XFree86-Sun24
# still not supported in 4.2.0:
-#Obsoletes: XFree86-Mach8 XFree86-8514 XFree86-AGX XFree86-P9000
+#Obsoletes: XFree86-8514
+#Obsoletes: XFree86-AGX
+#Obsoletes: XFree86-Mach8
+#Obsoletes: XFree86-P9000
# (and many drivers from XF86_SVGA server... and some from others)
Obsoletes: XFree86-XF86Setup
+Obsoletes: XFree86-Xserver
Obsoletes: Xconfigurator
%description Xserver
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
Requires: fontconfig-devel >= 1:2.2.0
Provides: XFree86-devel = %{epoch}:%{version}-%{release}
+Provides: libXvMCW-devel
Provides: render = 0.8
Provides: xcursor-devel = 1.1.2
Provides: xft-devel = 2.1.6
Obsoletes: XFree86-xft2-devel
Obsoletes: XFree86-xrender-devel
Obsoletes: Xft-devel
+Obsoletes: libXvMCW-devel
Obsoletes: render
Obsoletes: xcursor-devel
Obsoletes: xft-devel
Summary(pl): Sterownik do kart ATI
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-driver-i2c = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-ATI
Obsoletes: XFree86-Mach32
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
Obsoletes: XFree86-Rage128
Obsoletes: XFree86-driver-r128
%description driver-r128 -l pl
Sterownik do kart ATI Rage 128.
+%package driver-r128-dri
+Summary: DRI modules for ATI Rage 128 video driver
+Summary(pl): Modu³y DRI dla sterownika do kart ATI Rage 128
+Group: X11/Servers
+Requires: %{name}-driver-r128 = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-r128-dri
+DRI modules for ATI Rage 128 video driver.
+
+%description driver-r128-dri -l pl
+Modu³y DRI dla sterownika do kart ATI Rage 128.
+
%package driver-radeon
Summary: ATI Radeon video driver
Summary(pl): Sterownik do kart ATI Radeon
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-driver-ati = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+Obsoletes: XFree86-driver-radeon
+
+%description driver-radeon
+ATI Radeon video driver.
+
+%description driver-radeon -l pl
+Sterownik do kart ATI Radeon.
+
+%package driver-radeon-dri
+Summary: DRI modules for ATI Radeon video driver
+Summary(pl): Modu³y DRI dla sterownika do kart ATI Radeon
+Group: X11/Servers
+Requires: %{name}-driver-radeon = %{epoch}:%{version}-%{release}
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
# for dri
Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
# -libs already required by -OpenGL-libGL
%endif
-Obsoletes: XFree86-driver-radeon
-%description driver-radeon
-ATI Radeon video driver.
+%description driver-radeon-dri
+DRI modules for ATI Radeon video driver.
-%description driver-radeon -l pl
-Sterownik do kart ATI Radeon.
+%description driver-radeon-dri -l pl
+Modu³y DRI dla sterownika do kart ATI Radeon.
%package driver-chips
Summary: Chips and Technologies video driver
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
Obsoletes: XFree86-3DLabs
Obsoletes: XFree86-driver-glint
%description driver-glint -l pl
Sterownik do kart GLINT i Permedia.
+%package driver-glint-dri
+Summary: DRI modules for GLINT/Permedia video driver
+Summary(pl): Modu³y DRI dla sterownika do kart GLINT i Permedia
+Group: X11/Servers
+Requires: %{name}-driver-glint = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-glint-dri
+DRI modules for GLINT/Permedia video driver.
+
+%description driver-glint-dri -l pl
+Modu³y DRI dla sterownika do kart GLINT i Permedia.
+
%package driver-i128
Summary: Number 9 I128 video driver
Summary(pl): Sterownik do kart Number 9 I128
%description driver-i128 -l pl
Sterownik do kart Number 9 I128.
+%package driver-i2c
+Summary: I2C drivers
+Summary(pl): Sterowniki I2C
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-i2c
+I2C drivers.
+
+%description driver-i2c -l pl
+Sterowniki I2C.
+
%package driver-i740
Summary: Intel i740 video driver
Summary(pl): Sterownik do kart na uk³adzie Intel i740
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
Obsoletes: XFree86-driver-i810
Obsoletes: XFree86-i810
%description driver-i810 -l pl
Sterownik do grafiki na uk³adach Intel i810/i815/i830.
+%package driver-i810-dri
+Summary: DRI modules dor Intel i810/i815/i830 video driver
+Summary(pl): Modu³y DRI dla sterownika do grafiki na uk³adach Intel i810/i815/i830
+Group: X11/Servers
+Requires: %{name}-driver-i810 = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-i810-dri
+DRI modules dor Intel i810/i815/i830 video driver.
+
+%description driver-i810-dri -l pl
+Modu³y DRI dla sterownika 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/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
Obsoletes: XFree86-driver-mga
Obsoletes: XFree86-mga
%description driver-mga -l pl
Sterownik do kart Matrox.
+%package driver-mga-dri
+Summary: DRI modules for Matrox video driver
+Summary(pl): Moduly DRI dla sterownika do kart Matrox
+Group: X11/Servers
+Requires: %{name}-driver-mga = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-mga-dri
+DRI modules for Matrox video driver.
+
+%description driver-mga-dri -l pl
+Moduly DRI dla sterownika do kart Matrox.
+
%package driver-neomagic
Summary: NeoMagic video driver
Summary(pl): Sterownik do kart NeoMagic
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-%endif
Obsoletes: XFree86-SiS
Obsoletes: XFree86-driver-sis
%description driver-sis -l pl
Sterownik do kart na uk³adach SiS.
+%package driver-sis-dri
+Summary: DRI modules for SiS video driver
+Summary(pl): Modu³y DRI dla sterownika do kart na uk³adach SiS
+Group: X11/Servers
+Requires: %{name}-driver-sis = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+%endif
+
+%description driver-sis-dri
+DRI modules for SiS video driver.
+
+%description driver-sis-dri -l pl
+Modu³y DRI dla sterownika do kart na uk³adach SiS.
+
+%package driver-sisusb
+Summary: Video driver for SiS video chips connected via a Net2280-based USB dongle
+Summary(pl): Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB Net2280
+Group: X11/Servers
+Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
+Requires: %{name}-modules = %{epoch}:%{version}-%{release}
+
+%description driver-sisusb
+Video driver for SiS video chips connected via a Net2280-based USB
+dongle. It supports SiS315E/PRO video chipset.
+
+Note: it requires a Linux kernel driver (included in Linux 2.6.12 and
+later).
+
+%description driver-sisusb -l pl
+Sterownik obrazu dla uk³adów SiS pod³±czonych poprzez przej¶ciówkê USB
+opart± na uk³adzie Net2280. Obs³uguje uk³ad graficzny SiS315E/PRO.
+
+Uwaga: wymaga sterownika j±dra Linuksa (za³±czonego w wersji Linuksa
+2.6.12 i pó¼niejszych).
+
%package driver-sunbw2
Summary: sunbw2 - Sun BW2 video driver
Summary(pl): Sterownik do monochromatycznego framebuffera BW2 na Sunie
Group: X11/Servers
Requires: %{name}-Xserver = %{epoch}:%{version}-%{release}
Requires: %{name}-modules = %{epoch}:%{version}-%{release}
-%ifarch %{ix86} ia64 alpha arm ppc
-# for dri
-Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
-Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
-# -libs already required by -OpenGL-libGL
-# dlopens libglide3x.so
-Requires: Glide3-DRI
-%endif
Obsoletes: XFree86-3dfx
Obsoletes: XFree86-driver-tdfx
Sterownik DRI wymaga pakietu Glide_V3-DRI do kart Banshee lub Voodoo3,
a Glide_V5-DRI do kart Voodoo4 lub Voodoo5.
+%package driver-tdfx-dri
+Summary: DRI modules for 3Dfx video driver
+Summary(pl): Modu³y DRI dla sterownika do kart 3Dfx
+Group: X11/Servers
+Requires: %{name}-driver-tdfx = %{epoch}:%{version}-%{release}
+%ifarch %{ix86} ia64 alpha arm ppc
+# for dri
+Requires: %{name}-OpenGL-core = %{epoch}:%{version}-%{release}
+Requires: %{name}-OpenGL-libGL = %{epoch}:%{version}-%{release}
+# -libs already required by -OpenGL-libGL
+# dlopens libglide3x.so
+Requires: Glide3-DRI
+%endif
+
+%description driver-tdfx-dri
+DRI modules for 3Dfx video driver.
+
+%description driver-tdfx-dri -l pl
+Modu³y DRI dla sterownika do kart 3Dfx.
+
%package driver-tga
Summary: TGA video driver
Summary(pl): Sterownik do kart TGA
Summary(uk): â¦Â̦ÏÔÅËÉ ÓЦÌØÎÏÇÏ ×ÉËÏÒÉÓÔÁÎÎÑ ÄÌÑ X Window System (X11R6.4)
Group: X11/Libraries
Requires(post,postun): /sbin/ldconfig
+Requires(triggerpostun): sed >= 4.0
Requires: %{name}-common = %{epoch}:%{version}-%{release}
Requires: glibc >= 6:2.3.5-7.6
Provides: XFree86-libs = %{epoch}:%{version}-%{release}
-Provides: xcursor = 1.1.2
-Provides: xft = 2.1.6
-Provides: xpm
-Provides: xrender = 0.8.4
#Provides: libXcomposite
#Provides: libXdamage
#Provides: libXfixes
#Provides: libXrender
+Provides: libXvMCW
+Provides: xcursor = 1.1.2
+Provides: xft = 2.1.6
+Provides: xpm
+Provides: xrender = 0.8.4
%ifarch sparc sparc64 sparcv9
Obsoletes: X11R6.1-libs
%endif
Obsoletes: XFree86-xft2
Obsoletes: XFree86-xrender
Obsoletes: Xft
+Obsoletes: libXvMCW
Obsoletes: xcursor
Obsoletes: xft
+Obsoletes: xorg-x11-libs-data
Obsoletes: xpm
Obsoletes: xrender
Summary(uk): ðÒÏÓÔÉÊ ×¦ËÏÎÎÉÊ ÍÅÎÅÄÖÅÒ
Group: X11/Window Managers
Requires: %{name}-libs = %{epoch}:%{version}-%{release}
+Requires: filesystem >= 2.0-1
Provides: twm = %{epoch}:%{version}-%{release}
Obsoletes: XFree86-twm
Obsoletes: twm
Obsoletes: XFree86-xfs
Obsoletes: xfs
Obsoletes: xfsft
+Obsoletes: xorg-x11-xfs
%description xfs
This is a font server for XOrg X11. You can serve fonts to other X
%prep
%setup -qc -a1 -a2 -a7
-%patch1 -p0
+cd xc
+%patch0 -p0
+%patch64 -p1
+%patch33 -p0
+%patch35 -p0
+cd ..
+%patch34 -p1
+%patch1 -p1
%{?with_glide:%patch2 -p0}
%patch3 -p0
-%patch4 -p0
+%patch4 -p1
%patch5 -p0
%patch6 -p0
%patch7 -p0
%patch16 -p0
%patch17 -p0
%patch18 -p0
-%patch19 -p0
+%patch19 -p1
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch25 -p1
%patch26 -p0
%patch27 -p0
+%patch28 -p1
rm -f xc/config/cf/host.def
%patch29 -p1
-cd xc
-%patch33 -p0
-cd -
+%patch30 -p0
%patch31 -p0
-%patch35 -p0
+%patch32 -p0
+%patch36 -p0
%patch50 -p1
%patch60 -p0
-%patch61 -p1
+# FIXME
+# %patch61 -p1
%patch62 -p1
%patch63 -p1
-%patch64 -p1
-%patch65 -p0
-%patch66 -p0
-
-%patch67 -p0
-%patch68 -p0
-%patch69 -p0
-%patch70 -p0
-%patch71 -p0
+# FIXME, is this still needed?
+# %patch69 -p0
+# FIXME, is this still needed?
+# %patch71 -p0
%{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
-%patch73 -p0
-
-%patch74 -p0
+%{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
%{?with_dualhead:%patch100 -p1}
-%patch101 -p1
-%{?with_r300:%patch102 -p0}
-
sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig,xdg} \
+install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfig} \
$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/usr/{bin,include,lib} \
$RPM_BUILD_ROOT/var/{log,lib/xkb} \
$RPM_BUILD_ROOT{%{_desktopdir},%{_iconsdir},%{_pixmapsdir}/mini} \
- $RPM_BUILD_ROOT{%{_wmpropsdir},%{_soundsdir},%{_themesdir}/{Default,ThinIce,Metal,Industrial}} \
- $RPM_BUILD_ROOT{%{_xsessdir},%{_wallpapersdir},%{_wmstylesdir}} \
+ $RPM_BUILD_ROOT{%{_wmpropsdir},%{_themesdir}/{ThinIce,Metal,Industrial}} \
+ $RPM_BUILD_ROOT%{_xsessdir} \
$RPM_BUILD_ROOT%{_pkgconfigdir}
PWD=`pwd`
%{__make} -C xc install install.man \
DESTDIR="$RPM_BUILD_ROOT" \
- DOCDIR="/usr/share/doc/%{name}-%{version}" \
+ DOCDIR="%{_docdir}/%{name}-%{version}" \
INSTBINFLAGS="-m 755" \
INSTPGMFLAGS="-m 755" \
RAWCPP="/lib/cpp" \
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%{_libx11dir}/doc
+ln -sf %{_docdir}/%{name}-%{version} $RPM_BUILD_ROOT%{_libx11dir}/doc
rm -f $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_libx11dir}/config/host.def
:> $RPM_BUILD_ROOT%{_sysconfdir}/X11/xorg.conf
-rm -rf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/html
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/html
# resolve conflict with man-pages
mv -f $RPM_BUILD_ROOT%{_mandir}/man4/{mouse.4,mouse-x.4}
# help rpm to detect deps
chmod 755 $RPM_BUILD_ROOT%{_libdir}/modules/dri/*.so
-gzip -9nf $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/*
+gzip -9nf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/*
# don't gzip README.* files, they are needed by XF86Setup
-gunzip $RPM_BUILD_ROOT/usr/share/doc/%{name}-%{version}/README.*
+gunzip $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}/README.*
install -d $RPM_BUILD_ROOT/etc/ld.so.conf.d
echo '%{_libdir}' > $RPM_BUILD_ROOT/etc/ld.so.conf.d/X11-%{_lib}.conf
+chmod -R u+w $RPM_BUILD_ROOT
+
+cp -a %{SOURCE54} $RPM_BUILD_ROOT%{_sysconfdir}/X11/XvMCConfig
+
%clean
rm -rf $RPM_BUILD_ROOT
%post xdm
/sbin/chkconfig --add xdm
if [ -f /var/lock/subsys/xdm ]; then
- echo "Run \"/etc/rc.d/init.d/xdm restart\" to restart xdm." >&2
+ echo "Run \"/sbin/service 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
+ echo "Run \"/sbin/service xdm start\" to start xdm." >&2
fi
%preun xdm
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xdm ]; then
- /etc/rc.d/init.d/xdm stop >&2
- fi
/sbin/chkconfig --del xdm
+ %service xdm stop
fi
%pre xfs
%post xfs
/sbin/chkconfig --add xfs
-if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs restart >&2
-else
- echo "Run \"/etc/rc.d/init.d/xfs start\" to start font server." >&2
-fi
+%service xfs restart "font server"
%preun xfs
if [ "$1" = "0" ]; then
- if [ -f /var/lock/subsys/xfs ]; then
- /etc/rc.d/init.d/xfs stop >&2
- fi
+ %service xfs stop
/sbin/chkconfig --del xfs
fi
%groupadd -P %{name}-xfs -g 56 -r -f xfs
%useradd -P %{name}-xfs -u 56 -r -d /etc/X11/fs -s /bin/false -c "X Font Server" -g xfs xfs
/sbin/chkconfig --add xfs
-/etc/rc.d/init.d/xfs start >&2
+/sbin/service xfs start >&2
%triggerpostun Xserver -- XFree86-Xserver
if [ -s /etc/X11/XF86Config.rpmsave ]; then
%attr(755,root,root) %{_libx11dir}/xinit
%attr(755,root,root) %{_libx11dir}/xsm
-%dir /etc/X11/xinit
%dir /etc/X11/lbxproxy
/etc/X11/lbxproxy/*
%dir /etc/X11/proxymngr
%files OpenGL-core
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/extensions/libglx.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.a
+%attr(755,root,root) %{_libdir}/modules/extensions/libglx.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libGLcore.so
%files OpenGL-libGL
%defattr(644,root,root,755)
%files Xserver
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/Xorg
-%attr(755,root,root) %{_bindir}/Xdmx
+%attr(755,root,root) %{_bindir}/*dmx*
%attr(4755,root,root) %{_bindir}/Xwrapper
%attr(755,root,root) %{_bindir}/getconfig*
%attr(755,root,root) %{_sysconfdir}/X11/X
%attr(755,root,root) %{_bindir}/X
-%{_mandir}/man1/Xdmx.1*
%{_mandir}/man1/Xorg.1*
%{_mandir}/man1/Xserver.1*
+%{_mandir}/man1/*dmx*.1*
%{_mandir}/man1/getconfig.1*
%{_mandir}/man5/xorg.conf.5*
%{_mandir}/man5/getconfig.5*
+
%{_libx11dir}/Cards
%{_libx11dir}/Options
%{_libx11dir}/getconfig
%config(missingok,noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/xorg.conf
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/X11/XvMCConfig
%attr(640,root,root) %config %verify(not md5 mtime size) /etc/pam.d/xserver
%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) /etc/security/blacklist.xserver
%config(missingok) /etc/security/console.apps/xserver
%attr(755,root,root) %{_bindir}/xcursor-config
%attr(755,root,root) %{_bindir}/xft-config
%attr(755,root,root) %{_libdir}/libFS.so
-%attr(755,root,root) %{_libdir}/libI810XvMC.so
+%attr(755,root,root) %{_libdir}/lib*XvMC*.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}/libXt.so
%attr(755,root,root) %{_libdir}/libXtst.so
%attr(755,root,root) %{_libdir}/libXv.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
%{_includedir}/xf86*.h
%{_libx11dir}/config
%{_mandir}/man1/bdftopcf.1*
+%{_mandir}/man1/xft-config.1*
%{_mandir}/man3/[A-FH-Zl]*
%{_pkgconfigdir}/xcomposite.pc
%{_pkgconfigdir}/xcursor.pc
%ifarch %{ix86} ia64 %{x8664}
%files driver-apm
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/apm_drv.so
%{_mandir}/man4/apm.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-ark
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/ark_drv.so
%endif
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-chips
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/chips_drv.so
%{_mandir}/man4/chips.4*
%endif
%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-cirrus
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.o
+%attr(755,root,root) %{_libdir}/modules/drivers/cirrus_*.so
%{_mandir}/man4/cirrus.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-cyrix
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/cyrix_drv.so
%{_mandir}/man4/cyrix.4*
%endif
%ifarch %{ix86} ia64 %{x8664} alpha sparc sparc64 sparcv9 mips ppc arm superh
%files driver-fbdev
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/fbdev_drv.so
%{_mandir}/man4/fbdev.4*
%endif
%if %{with glide}
%files driver-glide
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/glide_drv.so
%{_mandir}/man4/glide.4*
%endif
%endif
%files driver-glint
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/glint_drv.so
+%{_mandir}/man4/glint.4*
+
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
+#%files driver-glint-dri
+#%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
%endif
-%{_mandir}/man4/glint.4*
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664}
%files driver-i128
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i128_drv.so
%{_mandir}/man4/i128.4*
%endif
+%files driver-i2c
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/multimedia/bt*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/fi*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/tda*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/msp*.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/uda*.so
+
# Devel: sparc sparc64
%ifarch %{ix86} ia64
%files driver-i740
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i740_drv.so
%{_mandir}/man4/i740.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-i810
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/i810_drv.so
+%{_mandir}/man4/i810.4*
+
+%files driver-i810-dri
%ifarch %{ix86} ia64
%attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
%endif
%attr(755,root,root) %{_libdir}/modules/dri/i915_dri.so
-%{_mandir}/man4/i810.4*
%endif
# Devel: %{ix86} sparc sparc64 ppc %{x8664}
%if 0
%files driver-imstt
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/imstt_drv.so
%{_mandir}/man4/imstt.4*
%endif
%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha ppc arm
%files driver-mga
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/mga_drv.so
+%{_mandir}/man4/mga.4*
+
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-mga-dri
%attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
%endif
-%{_mandir}/man4/mga.4*
%endif
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664}
%files driver-neomagic
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/neomagic_drv.so
%{_mandir}/man4/neomagic.4*
%endif
%ifarch mips
%files driver-newport
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/newport_drv.so
%{_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
+%attr(755,root,root) %{_libdir}/modules/drivers/nsc_drv.so
%{_mandir}/man4/nsc.4*
%endif
%ifarch %{ix86} ia64 %{x8664} mips alpha arm ppc
%files driver-nv
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.o
-%attr(755,root,root) %{_libdir}/modules/drivers/riva128.o
+%attr(755,root,root) %{_libdir}/modules/drivers/nv_drv.so
+%attr(755,root,root) %{_libdir}/modules/drivers/riva128.so
%{_mandir}/man4/nv.4*
%endif
%files driver-ati
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/ati*_drv.so
+%attr(755,root,root) %{_libdir}/modules/multimedia/theatre*_drv.so
%files driver-r128
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/r128*_drv.so
+%{_mandir}/man4/r128.4*
+
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-r128-dri
%attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
%endif
-%{_mandir}/man4/r128.4*
%files driver-radeon
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/radeon*_drv.so
+%{_mandir}/man4/radeon.4*
+
%ifarch %{ix86} ia64 %{x8664} alpha ppc arm
+%files driver-radeon-dri
%attr(755,root,root) %{_libdir}/modules/dri/radeon_dri.so
%attr(755,root,root) %{_libdir}/modules/dri/r200_dri.so
+%if %{with r300}
+%attr(755,root,root) %{_libdir}/modules/dri/r300_dri.so
+%endif
%endif
-%{_mandir}/man4/radeon.4*
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-rendition
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/rendition_drv.so
%{_libdir}/modules/*.uc
%{_mandir}/man4/rendition.4*
%endif
%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-s3virge
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/s3virge_drv.so
%{_mandir}/man4/s3virge.4*
%endif
%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-s3
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/s3_drv.so
#%%{_mandir}/man4/s3.4*
%endif
%ifarch %{ix86} ia64 %{x8664} mips alpha ppc arm
%files driver-savage
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/savage_drv.so
%{_mandir}/man4/savage.4*
%endif
%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-siliconmotion
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/siliconmotion_drv.so
%{_mandir}/man4/siliconmotion.4*
%endif
%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-sis
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sis_drv.so
+%{_mandir}/man4/sis.4*
+
%ifarch %{ix86} ia64
+%files driver-sis-dri
%attr(755,root,root) %{_libdir}/modules/dri/sis_dri.so
%endif
-%{_mandir}/man4/sis.4*
%endif
+%files driver-sisusb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/modules/drivers/sisusb_drv.so
+%{_mandir}/man4/sisusb.4*
+
%ifarch sparc sparc64 sparcv9
%files driver-sunbw2
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunbw2_drv.so
%{_mandir}/man4/sunbw2.4*
%endif
%ifarch sparc sparc64 sparcv9
%files driver-suncg14
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg14_drv.so
%{_mandir}/man4/suncg14.4*
%endif
%ifarch sparc sparc64 sparcv9
%files driver-suncg3
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg3_drv.so
%{_mandir}/man4/suncg3.4*
%endif
%ifarch sparc sparc64 sparcv9
%files driver-suncg6
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suncg6_drv.so
%{_mandir}/man4/suncg6.4*
%endif
%ifarch sparc sparc64 sparcv9
%files driver-sunffb
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunffb_drv.so
# Devel: %{ix86} ia64 (for fun?)
%attr(755,root,root) %{_libdir}/modules/dri/ffb_dri.so
%{_mandir}/man4/sunffb.4*
%ifarch sparc sparc64 sparcv9
%files driver-sunleo
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/sunleo_drv.so
%{_mandir}/man4/sunleo.4*
%endif
%ifarch sparc sparc64 sparcv9
%files driver-suntcx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/suntcx_drv.so
%{_mandir}/man4/suntcx.4*
%endif
%ifarch %{ix86} ia64 %{x8664} sparc sparc64 sparcv9 mips alpha arm ppc
%files driver-tdfx
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tdfx_drv.so
+%{_mandir}/man4/tdfx.4*
+
%ifarch %{ix86} ia64 alpha arm
+%files driver-tdfx-dri
%attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
%endif
-%{_mandir}/man4/tdfx.4*
%endif
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} alpha
%files driver-tga
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tga_drv.so
%endif
# Devel: sparc sparc64
%ifarch %{ix86} ia64 %{x8664} mips ppc arm
%files driver-trident
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/trident_drv.so
%{_mandir}/man4/trident.4*
%endif
%ifarch %{ix86} ia64 %{x8664}
%files driver-tseng
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/tseng_drv.so
%{_mandir}/man4/tseng.4*
%endif
%ifarch %{ix86} ia64
%files driver-via
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/via_drv.so
+%ifarch %{ix86}
+%attr(755,root,root) %{_libdir}/modules/dri/unichrome_dri.so
+%endif
%{_mandir}/man4/via.4*
%endif
%ifarch %{ix86} ia64
%files driver-vmware
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vmware_drv.so
%{_mandir}/man4/vmware.4*
%endif
%files libs
%defattr(644,root,root,755)
/etc/ld.so.conf.d/*.conf
-%dir %{_sysconfdir}/xdg
-%dir %{_themesdir}
-%dir %{_themesdir}/Default
%dir %{_themesdir}/ThinIce
%dir %{_themesdir}/Metal
%dir %{_themesdir}/Industrial
/usr/include/X11
%dir %{_sbindir}
%dir %{_datadir}/misc
-%dir %{_iconsdir}
-%dir %{_pixmapsdir}
%dir %{_pixmapsdir}/mini
-%dir %{_soundsdir}
-%dir %{_wallpapersdir}
-%dir %{_wmpropsdir}
-%dir %{_xsessdir}
-%dir %{_wmstylesdir}
%attr(755,root,root) %{_libdir}/libFS.so.*.*
-%attr(755,root,root) %{_libdir}/libI810XvMC.so.*.*
+%attr(755,root,root) %{_libdir}/lib*XvMC*.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}/libXt.so.*.*
%attr(755,root,root) %{_libdir}/libXtst.so.*.*
%attr(755,root,root) %{_libdir}/libXv.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.*.*
%dir %{_libdir}/modules
%dir %{_libdir}/modules/dri
%dir %{_libdir}/modules/drivers
-%attr(755,root,root) %{_libdir}/modules/*.a
-%attr(755,root,root) %{_libdir}/modules/drivers/linux
+%attr(755,root,root) %{_libdir}/modules/*.so
+%attr(755,root,root) %{_libdir}/modules/drivers/v4l_drv.so
%ifarch %{ix86} ia64 %{x8664} sparc sparc64 alpha ppc arm
-%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vga_drv.so
%endif
%ifarch %{ix86} ia64 %{x8664} sparc sparc64
-%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.o
+%attr(755,root,root) %{_libdir}/modules/drivers/vesa_drv.so
%endif
%dir %{_libdir}/modules/extensions
-%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libdri.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.a
-%attr(755,root,root) %{_libdir}/modules/extensions/librecord.a
-%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.a
+%dir %{_libdir}/modules/multimedia
+%attr(755,root,root) %{_libdir}/modules/extensions/libdbe.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libdri.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libextmod.so
+%attr(755,root,root) %{_libdir}/modules/extensions/librecord.so
+%attr(755,root,root) %{_libdir}/modules/extensions/libxtrap.so
%attr(755,root,root) %{_libdir}/modules/fonts
%attr(755,root,root) %{_libdir}/modules/input
%attr(755,root,root) %{_libdir}/modules/linux
%files static
%defattr(644,root,root,755)
%{_libdir}/libFS.a
-%{_libdir}/libI810XvMC.a
+%{_libdir}/lib*XvMC*.a
%{_libdir}/libICE.a
%{_libdir}/libSM.a
%{_libdir}/libX11.a
%{_libdir}/libXt.a
%{_libdir}/libXtst.a
%{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
%{_libdir}/libXxf86dga.a
%{_libdir}/libXxf86misc.a
%{_libdir}/libXxf86rush.a
%attr(755,root,root) %{_bindir}/xclipboard
%attr(755,root,root) %{_bindir}/xclock
%attr(755,root,root) %{_bindir}/xditview
+%attr(755,root,root) %{_bindir}/xdbedizzy
+%attr(755,root,root) %{_bindir}/xdpr
%attr(755,root,root) %{_bindir}/xdriinfo
%attr(755,root,root) %{_bindir}/xedit
%attr(755,root,root) %{_bindir}/xev
%attr(755,root,root) %{_bindir}/xmore
%attr(755,root,root) %{_bindir}/xphelloworld
%attr(755,root,root) %{_bindir}/xplsprinters
+%attr(755,root,root) %{_bindir}/xpr
%attr(755,root,root) %{_bindir}/xprehashprinterlist
%attr(755,root,root) %{_bindir}/xpsimplehelloworld
%attr(755,root,root) %{_bindir}/xpxthelloworld
%{_mandir}/man1/xclipboard.1*
%{_mandir}/man1/xclock.1*
%{_mandir}/man1/xditview.1*
+%{_mandir}/man1/xdbedizzy.1*
+%{_mandir}/man1/xdpr.1*
%{_mandir}/man1/xdriinfo.1*
%{_mandir}/man1/xmore.1*
%{_mandir}/man1/xedit.1*
%{_mandir}/man1/xmh.1*
%{_mandir}/man1/xphelloworld.1*
%{_mandir}/man1/xplsprinters.1*
+%{_mandir}/man1/xpr.1*
%{_mandir}/man1/xprehashprinterlist.1*
%{_mandir}/man1/xpsimplehelloworld.1*
%{_mandir}/man1/xpxthelloworld.1*
%files xauth
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/xauth
+%attr(755,root,root) %{_bindir}/xauth*
%{_mandir}/man1/xauth.1*
%files xdm