SPECS: X11.spec - consolidated r300 patch

[arekm]

Author: arekm                        Date: Tue Dec 27 22:39:23 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- consolidated r300 patch

---- Files affected:
SPECS:
   X11.spec (1.172 -> 1.173) 

---- Diffs:

================================================================
Index: SPECS/X11.spec
diff -u SPECS/X11.spec:1.172 SPECS/X11.spec:1.173
--- SPECS/X11.spec:1.172	Tue Dec 27 23:14:38 2005
+++ SPECS/X11.spec	Tue Dec 27 23:39:18 2005
@@ -12,10 +12,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
@@ -123,11 +121,8 @@
 # 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/
@@ -1995,12 +1990,9 @@
 # %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/*.*
 
@@ -2870,6 +2862,9 @@
 %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*
 
@@ -3456,6 +3451,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.173  2005/12/27 22:39:18  arekm
+- consolidated r300 patch
+
 Revision 1.172  2005/12/27 22:14:38  patrys
 - conditional r300 is back
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/X11.spec?r1=1.172&r2=1.173&f=u