rpms/xorg-x11/devel xorg-x11.spec,1.193,1.194

Fri May 13 15:20:34 UTC 2005

Author: mharris

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

Modified Files:
	xorg-x11.spec 
Log Message:
- Added xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch to workaround issue
  on ia64 with CPIO disabled in ati Mach64 driver (#155609,155610).  For
  future reference, this is also included in RHEL4_U1 build 6.8.2-1.EL.13.5.




Index: xorg-x11.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11/devel/xorg-x11.spec,v
retrieving revision 1.193
retrieving revision 1.194
diff -u -r1.193 -r1.194

--- xorg-x11.spec	30 Apr 2005 17:48:54 -0000	1.193
+++ xorg-x11.spec	13 May 2005 15:20:32 -0000	1.194
@@ -18,8 +18,8 @@
 
 Name: xorg-x11
 Version: 6.8.2
-Release: 30
-#Release: 1.FC3.29
+Release: 31
+#Release: 1.FC3.31
 
 %define build_mharris_mode	0
 
@@ -473,6 +473,8 @@
 # forward, but until the dynamic clocks code is fixed properly, let's
 # stick to something that works.
 Patch9335: xorg-x11-6.8.1-ati-radeon-dynamic-clocks-fix-2.patch
+Patch9336: xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch
+Patch9337: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
 
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently).
 # Once a patch is determined to be safe to apply to other releases, it can
@@ -494,7 +496,6 @@
 Patch9700: xorg-x11-6.8.3-alpha-srel32-fix-fdo1765-2174.patch
 Patch9701: xorg-x11-6.8.3-canonicalize-builderaddr-1-fdo2884-2293.patch
 Patch9702: xorg-x11-6.8.2-cursor-flicker.patch
-Patch9703: xorg-x11-6.8.2-use-linux-native-pciscan-by-default.patch
 Patch9705: xorg-x11-6.8.3-iso8859-compose-files-fdo2592-2156.patch
 Patch9706: xorg-x11-6.8.3-lbxproxy-fdo2678-2051.patch
 Patch9707: xorg-x11-6.8.3-nv-hw-fdo2533-1896.patch
@@ -1149,6 +1150,8 @@
 %patch9334 -p0 -b .xorg.conf.man-dont-refer-to-nonexisting-example
 
 %patch9335 -p0 -b .ati-radeon-dynamic-clocks-fix-2
+%patch9336 -p0 -b .xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch
+%patch9337 -p0 -b .use-linux-native-pciscan-by-default
 
 # EXPERIMENTAL PATCHES intended strictly for fedora-devel (FC4 currently)
 %if %{build_fc4}
@@ -1161,7 +1164,6 @@
 %patch9700 -p0 -b .alpha-srel32-fix-fdo1765-2174
 %patch9701 -p0 -b .canonicalize-builderaddr-1-fdo2884-2293
 %patch9702 -p0 -b .cursor-flicker
-%patch9703 -p0 -b .use-linux-native-pciscan-by-default
 %patch9705 -p0 -b .iso8859-compose-files-fdo2592-2156
 %patch9706 -p0 -b .lbxproxy-fdo2678-2051
 %patch9707 -p0 -b .nv-hw-fdo2533-1896
@@ -3613,6 +3615,11 @@
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 
 
 %changelog
+* Fri May 13 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-31
+- Added xorg-x11-6.8.2-ati-ragexl-ia64-avoidcpiofix.patch to workaround issue
+  on ia64 with CPIO disabled in ati Mach64 driver (#155609,155610).  For
+  future reference, this is also included in RHEL4_U1 build 6.8.2-1.EL.13.5.
+
 * Sat Apr 30 2005 Mike A. Harris <mharris at redhat.com> 6.8.2-30
 - Disabled xfs.init-fc4-startearly.patch as it breaks systems that /usr is
   on NFS. (FC4Blocker #156413)


