X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=X11.spec;h=3ca532b5046ebf59340dd52ef08f75ff2a3801b8;hb=d40a0832c8a0facf7c37b73230fc530d487737df;hp=d4231f03630fa45a636771a1180f595ce1f9aa02;hpb=bdb17b7163da524149796af6fa1a69e9d670629d;p=packages%2FX11.git

diff --git a/X11.spec b/X11.spec
index d4231f0..3ca532b 100644
--- a/X11.spec
+++ b/X11.spec
@@ -11,11 +11,8 @@
 #
 # 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
@@ -30,17 +27,17 @@ Summary(tr):	XOrg X11 Pencereleme Sistemi sunucular
 Summary(uk):	âÁÚÏצ ÛÒÉÆÔÉ, ÐÒÏÇÒÁÍÉ ÔÁ ÄÏËÕÍÅÎÔÁÃ¦Ñ ÄÌÑ ÒÏÂÏÞϧ ÓÔÁÎæ§ Ð¦Ä X
 Summary(zh_CN):	XOrg X11 ´°¿Úϵͳ·þÎñÆ÷ºÍ»ù±¾³ÌÐò
 Name:		X11
-Version:	6.8.2
-Release:	13
+Version:	6.9.0
+Release:	4
 Epoch:		1
 License:	MIT/X Consortium/BSD (see README)
 Group:		X11
 Source0:	ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src1.tar.gz
-# Source0-md5:	a9cfa54ae2e65a057b9c6416befeb6ab
+# Source0-md5:	9cd255a090e81e2c62637122794e6150
 Source1:	ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src2.tar.gz
-# Source1-md5:	b6f011b3131e442b8dab85d443d9a56f
+# Source1-md5:	f49a0993d89038a46556720688450479
 Source2:	ftp://ftp.x.org/pub/X11R%{version}/src/%{name}R%{version}-src3.tar.gz
-# Source2-md5:	057d20af30569434e2c6693c1ca66e57
+# Source2-md5:	4d5450bde835270632e004b25e45ef33
 Source7:	ftp://ftp.pld-linux.org/software/xinit/xdm-xinitrc-0.2.tar.bz2
 # Source7-md5:	0a15b1c374256b5cad7961807baa3896
 Source8:	xdm.pamd
@@ -100,46 +97,36 @@ Patch17:	%{name}-agpgart-load.patch
 Patch18:	%{name}-XTerm.ad.patch
 Patch19:	%{name}-llh.patch
 Patch20:	XFree86-xman-manpaths.patch
-Patch21:	XFree86-clearrts.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
 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
 # 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
+Patch73:	%{name}-r300.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
@@ -148,6 +135,7 @@ BuildRequires:	/usr/bin/perl
 %{?with_glide:BuildRequires:	Glide2x_SDK}
 %endif
 BuildRequires:	bison
+BuildRequires:	cpp
 BuildRequires:	ed
 BuildRequires:	expat-devel
 BuildRequires:	flex
@@ -164,9 +152,9 @@ Requires:	%{name}-libs = %{epoch}:%{version}-%{release}
 Requires:	%{name}-xauth = %{epoch}:%{version}-%{release}
 Requires:	pam >= 0.79.0
 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
@@ -404,9 +392,10 @@ Summary(pl):	Wsparcie OpenGL dla systemu X11R6 - biblioteka GL
 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
 
@@ -459,9 +448,9 @@ Group:		X11/Development/Libraries
 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
@@ -479,8 +468,8 @@ Summary:	X11R6 static libraries with OpenGL
 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
@@ -571,7 +560,6 @@ Requires:	/usr/X11R6/lib/X11/rgb.txt
 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
@@ -579,9 +567,13 @@ 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
@@ -684,6 +676,7 @@ Requires:	%{name}-imake = %{epoch}:%{version}-%{release}
 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
@@ -694,6 +687,7 @@ Provides:	xrender-devel = 0.8.4
 #Provides:	libXdamage-devel
 #Provides:	libXfixes-devel
 #Provides:	libXrender-devel
+Obsoletes:	libXvMCW-devel
 %ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-devel
 %endif
@@ -800,6 +794,7 @@ Summary:	ATI video driver
 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
@@ -980,6 +975,19 @@ Number 9 I128 video driver.
 %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
@@ -1208,6 +1216,27 @@ SiS video driver.
 %description driver-sis -l pl
 Sterownik 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
@@ -1424,14 +1453,16 @@ Requires(post,postun):	/sbin/ldconfig
 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
+Obsoletes:	libXvMCW
 %ifarch sparc sparc64 sparcv9
 Obsoletes:	X11R6.1-libs
 %endif
@@ -1443,6 +1474,7 @@ Obsoletes:	XFree86-xrender
 Obsoletes:	Xft
 Obsoletes:	xcursor
 Obsoletes:	xft
+Obsoletes:	xorg-x11-libs-data
 Obsoletes:	xpm
 Obsoletes:	xrender
 
@@ -1885,6 +1917,7 @@ Provides:	xfs = %{epoch}:%{version}-%{release}
 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
@@ -1920,10 +1953,10 @@ X11-libs.
 
 %prep
 %setup -qc -a1 -a2 -a7
-%patch1 -p0
+%patch1 -p1
 %{?with_glide:%patch2 -p0}
 %patch3 -p0
-%patch4 -p0
+%patch4 -p1
 %patch5 -p0
 %patch6 -p0
 %patch7 -p0
@@ -1938,7 +1971,7 @@ X11-libs.
 %patch16 -p0
 %patch17 -p0
 %patch18 -p0
-%patch19 -p0
+%patch19 -p1
 %patch20 -p1
 %patch21 -p1
 %patch22 -p1
@@ -1947,37 +1980,29 @@ X11-libs.
 %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
-%patch50 -p1
+# ankry, FIXME :)
+# %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
 
+%{?with_r300:%patch73 -p1}
 %{?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/*.*
@@ -2015,7 +2040,7 @@ install -d $RPM_BUILD_ROOT/etc/{pam.d,rc.d/init.d,security/console.apps,sysconfi
 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" \
@@ -2115,14 +2140,14 @@ ln -sf %{_fontsdir} $RPM_BUILD_ROOT%{_libx11dir}/fonts
 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}
@@ -2130,14 +2155,16 @@ 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
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -2496,8 +2523,8 @@ fi
 
 %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)
@@ -2568,18 +2595,19 @@ fi
 %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
@@ -2605,7 +2633,7 @@ fi
 %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
@@ -2634,7 +2662,6 @@ fi
 %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
@@ -2665,6 +2692,7 @@ fi
 %{_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
@@ -2682,7 +2710,7 @@ fi
 %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
 
@@ -2690,14 +2718,14 @@ fi
 %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
 
@@ -2705,21 +2733,21 @@ fi
 %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
 
@@ -2727,16 +2755,16 @@ fi
 %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
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
-%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
+#%attr(755,root,root) %{_libdir}/modules/dri/gamma_dri.so
 %endif
 %{_mandir}/man4/glint.4*
 
@@ -2744,15 +2772,23 @@ fi
 %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
 
@@ -2760,7 +2796,7 @@ fi
 %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
 %ifarch %{ix86} ia64
 %attr(755,root,root) %{_libdir}/modules/dri/i810_dri.so
 %endif
@@ -2772,14 +2808,14 @@ fi
 %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
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/mga_dri.so
 %endif
@@ -2790,7 +2826,7 @@ fi
 %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
 
@@ -2798,14 +2834,14 @@ fi
 %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
 
@@ -2813,18 +2849,19 @@ fi
 %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
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %attr(755,root,root) %{_libdir}/modules/dri/r128_dri.so
 %endif
@@ -2832,10 +2869,13 @@ fi
 
 %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
 %ifarch %{ix86} ia64 %{x8664} alpha ppc arm
 %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*
 
@@ -2843,7 +2883,7 @@ fi
 %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
@@ -2852,14 +2892,14 @@ fi
 %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
 
@@ -2867,7 +2907,7 @@ fi
 %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
 
@@ -2875,52 +2915,57 @@ fi
 %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
 %ifarch %{ix86} ia64
 %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*
@@ -2929,21 +2974,21 @@ fi
 %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
 %ifarch %{ix86} ia64 alpha arm
 %attr(755,root,root) %{_libdir}/modules/dri/tdfx_dri.so
 %endif
@@ -2954,28 +2999,28 @@ fi
 %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
 %{_mandir}/man4/via.4*
 %endif
 
@@ -2983,7 +3028,7 @@ fi
 %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
 
@@ -3035,7 +3080,7 @@ fi
 %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.*.*
@@ -3067,7 +3112,6 @@ fi
 %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.*.*
@@ -3086,20 +3130,21 @@ fi
 %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
@@ -3150,7 +3195,7 @@ fi
 %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
@@ -3179,7 +3224,6 @@ fi
 %{_libdir}/libXt.a
 %{_libdir}/libXtst.a
 %{_libdir}/libXv.a
-%{_libdir}/libXvMC.a
 %{_libdir}/libXxf86dga.a
 %{_libdir}/libXxf86misc.a
 %{_libdir}/libXxf86rush.a
@@ -3205,6 +3249,8 @@ fi
 %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
@@ -3222,6 +3268,7 @@ fi
 %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
@@ -3244,6 +3291,8 @@ fi
 %{_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*
@@ -3261,6 +3310,7 @@ fi
 %{_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*
@@ -3355,7 +3405,7 @@ fi
 
 %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