- consolidated r300 patch

Changed files:
    X11.spec -> 1.173

diff --git a/X11.spec b/X11.spec
index 5d0b6c0240d2c620de0d1a0e047f12a176ccbdcf..6a218042830d9e3e7deb403d351494ca65295d1e 100644 (file)
--- a/X11.spec
+++ b/X11.spec
@@ -11,10 +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            # enable r300_dri
 
 Summary:       XOrg X11 Window System servers and basic programs
 Summary(de):   XOrg X11 Window-System-Server und grundlegende Programme
@@ -122,11 +120,8 @@ Patch63:   %{name}-pci-build.patch
 # radeon
 Patch69:       %{name}-radeon-dynamic-clocks.patch
 Patch71:       %{name}-radeon-set-fb-location.patch
-
 Patch72:       http://glen.alkohol.ee/xkb/xorg.patch
-
-# r300
-Patch73:       %{name}-r300-Imakefile.patch
+Patch73:       %{name}-r300.patch
 
 #head-patch
 #ftp://ftp.linux.cz/pub/linux/people/jan_kasprzak/xorg-dualhead/
@@ -1994,12 +1989,9 @@ rm -f xc/config/cf/host.def
 # %patch71 -p0
 %{__patch} -d xc/programs/xkbcomp/symbols/pc < %{PATCH72}
 
-%{?with_r300:%patch73 -p0}
-
+%{?with_r300:%patch73 -p1}
 %{?with_dualhead:%patch100 -p1}
 
-%{?with_r300:sed -i -e 's/r200/r200 r300/g' xc/config/cf/*.cf}
-
 sed -i -e 's#krb5/##g' xc/lib/Xau/*.* xc/programs/xdm/greeter/*.* \
        xc/programs/xdm/*.* xc/programs/Xserver/os/*.*
 
@@ -2869,6 +2861,9 @@ fi
 %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*