- typo?

[packages/X11.git] / X11.spec

diff --git a/X11.spec b/X11.spec
index 3ca532b5046ebf59340dd52ef08f75ff2a3801b8..0e151822de734b4b87285e9fd4b7a6a31b1bd8ca 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -114,6 +114,7 @@ Patch60:    %{name}-oldkeyb.patch
 Patch61:       %{name}-sparc64-asmfix.patch
 Patch62:       %{name}-sparc64-v9fix.patch
 Patch63:       %{name}-pci-build.patch
+Patch64:       %{name}-xkbcomp-level.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
@@ -123,6 +124,7 @@ Patch69:    %{name}-radeon-dynamic-clocks.patch
 Patch71:       %{name}-radeon-set-fb-location.patch
 Patch72:       http://glen.alkohol.ee/xkb/xorg.patch
 Patch73:       %{name}-r300.patch
+Patch74:       %{name}-unichrome.patch
 
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
@@ -687,7 +689,6 @@ 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
@@ -698,6 +699,7 @@ Obsoletes:  XFree86-xft-devel
 Obsoletes:     XFree86-xft2-devel
 Obsoletes:     XFree86-xrender-devel
 Obsoletes:     Xft-devel
+Obsoletes:     libXvMCW-devel
 Obsoletes:     render
 Obsoletes:     xcursor-devel
 Obsoletes:     xft-devel
@@ -1462,7 +1464,6 @@ 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
@@ -1472,6 +1473,7 @@ Obsoletes:        XFree86-xft
 Obsoletes:     XFree86-xft2
 Obsoletes:     XFree86-xrender
 Obsoletes:     Xft
+Obsoletes:     libXvMCW
 Obsoletes:     xcursor
 Obsoletes:     xft
 Obsoletes:     xorg-x11-libs-data
@@ -1994,6 +1996,7 @@ rm -f xc/config/cf/host.def
 # %patch61 -p1
 %patch62 -p1
 %patch63 -p1
+%patch64 -p1
 
 # FIXME, is this still needed?
 # %patch69 -p0
@@ -2002,6 +2005,8 @@ rm -f xc/config/cf/host.def
 %{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
 
 %{?with_r300:%patch73 -p1}
+%{?with_r300:%patch74 -p1}
+# patch74 required patch73
 %{?with_dualhead:%patch100 -p1}
 
 sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
@@ -3021,6 +3026,9 @@ fi
 %files driver-via
 %defattr(644,root,root,755)
 %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