rpms/xorg-x11/devel xorg-x11.spec,1.204,1.205

[fedora-cvs-commits at redhat.com]

Author: mharris

Update of /cvs/dist/rpms/xorg-x11/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv31258

Modified Files:
	xorg-x11.spec 
Log Message:
- Removed unused legacy with_new_savage_driver macro and conditional
  spec file code.
- Added xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch to disable DRI on
  Radeon 7000/VE hardware to test patch in rawhide prior to inclusion in
  RHEL4U2. (#150174)




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.204
retrieving revision 1.205
diff -u -r1.204 -r1.205
--- xorg-x11.spec	7 Jun 2005 00:25:44 -0000	1.204
+++ xorg-x11.spec	16 Jun 2005 17:05:00 -0000	1.205
@@ -19,7 +19,7 @@
 Name: xorg-x11
 Version: 6.8.2
 Release: 38
-#Release: 1.FC3.35
+#Release: 1.FC3.39
 
 %define build_mharris_mode	0
 
@@ -105,8 +105,6 @@
 %define Glide3Require           0
 %endif
 
-%define with_new_savage_driver	0
-
 # s390 doesn't have video hardware.  xorg-x11 support for PPC64 is very very
 # new and experimental.  We ship libs only as PPC64 has we ship the PPC 32bit
 # X server.  When PPC64 is supported much better in xorg-x11, and we actually
@@ -346,7 +344,6 @@
 %if %{with_archexec}
 Source10: archexec
 %endif
-#Source14: http://www.probo.com/timr/savage-1.1.27t.tgz
 Source23: mkxauth
 Source24: mkxauth.1x
 Source25: CHANGELOG-rpm
@@ -371,6 +368,7 @@
 Patch1213: XFree86-4.3.0-radeon-ia64-preint10.patch
 Patch1214: XFree86-4.3.0-radeon-disable-VideoRAM-option.patch
 Patch1215: xorg-x11-6.8.1-ati-radeon-disable-dri.patch
+Patch1216: xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch
 
 # Patches 1300-1319: chips driver patches 
 Patch1300: XFree86-4.2.99.901-chips-default-to-noaccel-on-69000.patch
@@ -712,7 +710,6 @@
 # Files moved from these packages to XFree86-libs-data, and now to
 # xorg-x11-libs-data, so we conflict them
 Conflicts: XFree86 <= 4.2.99.2-0.20021105.0, XFree86-libs <= 4.2.99.2-0.20021105.0
-%endif
 #Requires(post): /sbin/ldconfig grep textutils
 #Requires(postun): /sbin/ldconfig grep textutils
 #Requires(verify): /sbin/ldconfig grep textutils
@@ -1046,16 +1043,6 @@
 # xc/config/cf/xfree86.cf.OBSOLETE-USE-xorg.cf-INSTEAD
 #%patch0 -p0 -b .xf-4_3-branch
 
-%if %{with_new_savage_driver}
-{
-   echo "Updating SAVAGE driver with %{SOURCE14}"
-   pushd xc/programs/Xserver/hw/xfree86/drivers
-   mv savage savage-4.3.0
-   tar zxvf %{SOURCE14}
-   popd
-}
-%endif
-
 %if %{with_fastbuild}
 %patch9 -p0 -b .makefile-fastbuild
 %endif
@@ -1064,8 +1051,9 @@
 %patch1214 -p0 -b .radeon-disable-VideoRAM-option
 
 %if %{build_rhel4}
-%patch1215 -p0 -b .ati-radeon-disable-dri
+#%patch1215 -p0 -b .ati-radeon-disable-dri
 %endif
+%patch1216 -p0 -b .ati-radeon-7000-disable-dri
 
 # FIXME: Chips & technologies -  Disable these two for now, to see if the
 # problems are resolved that these two worked around.
@@ -3574,7 +3562,14 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
-* Mon Jun 6 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-38
+* Thu Jun 9 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-38
+- Removed unused legacy with_new_savage_driver macro and conditional 
+  spec file code.
+- Added xorg-x11-6.8.2-ati-radeon-7000-disable-dri.patch to disable DRI on
+  Radeon 7000/VE hardware to test patch in rawhide prior to inclusion in
+  RHEL4U2. (#150174)
+
+* Mon Jun 6 2005 Mike A. Harris <mharris at redhat.com>
 - Removed with_libs_data macro as it is no longer useful.
 - Updated "Obsoletes: xorg-x11-libs-data" line to remove versioning