rpms/xorg-x11-drv-ati/devel .cvsignore, 1.6, 1.7 sources, 1.6, 1.7 xorg-x11-drv-ati.spec, 1.13, 1.14

[fedora-cvs-commits at redhat.com]

Author: krh

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

Modified Files:
	.cvsignore sources xorg-x11-drv-ati.spec 
Log Message:
* Wed Mar 22 2006 Kristian Høgsberg <krh at redhat.com> 6.5.7.3-4.cvs20060322
- Update to CVS snapshot of 20060322.
- Drop xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch.



Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	3 Feb 2006 13:28:51 -0000	1.6
+++ .cvsignore	22 Mar 2006 23:45:11 -0000	1.7
@@ -1 +1 @@
-xf86-video-ati-6.5.7.3.tar.bz2
+xf86-video-ati-cvs20060322.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	3 Feb 2006 13:28:51 -0000	1.6
+++ sources	22 Mar 2006 23:45:11 -0000	1.7
@@ -1 +1 @@
-a87420414681c53681a330b55ffb04ea  xf86-video-ati-6.5.7.3.tar.bz2
+ae8dc70c96175f5b39e27aef80f32e6c  xf86-video-ati-cvs20060322.tar.bz2


Index: xorg-x11-drv-ati.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-ati/devel/xorg-x11-drv-ati.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- xorg-x11-drv-ati.spec	21 Feb 2006 13:27:46 -0000	1.13
+++ xorg-x11-drv-ati.spec	22 Mar 2006 23:45:11 -0000	1.14
@@ -1,8 +1,8 @@
-%define tarball xf86-video-ati
+%define tarball xf86-video-ati-%{cvsdate}
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate xxxxxxx
+%define cvsdate cvs20060322
 
 %ifarch %{ix86} x86_64 ia64 ppc alpha
 %define with_dri	1
@@ -13,22 +13,21 @@
 Summary:   Xorg X11 ati video driver
 Name:      xorg-x11-drv-ati
 Version:   6.5.7.3
-Release:   4
+Release:   4.%{cvsdate}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}-%{version}.tar.bz2
+Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
 Source1:   ati.xinf
 Source2:   r128.xinf
 Source3:   radeon.xinf
-Patch0:    xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64 ppc alpha sparc sparc64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.1
 %if %{with_dri}
 BuildRequires: mesa-libGL-devel >= 6.4-4
 BuildRequires: libdrm-devel >= 2.0-1
@@ -40,8 +39,7 @@
 X.Org X11 ati video driver.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-%patch0 -p2 -b .radeon-metamodes-SEGV-fix
+%setup -q -n %{tarball}
 
 %build
 %configure --disable-static
@@ -85,6 +83,10 @@
 %{_mandir}/man4/radeon.4*
 
 %changelog
+* Wed Mar 22 2006 Kristian Høgsberg <krh at redhat.com> 6.5.7.3-4.cvs20060322
+- Update to CVS snapshot of 20060322.
+- Drop xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch.
+
 * Tue Feb 21 2006 Mike A. Harris <mharris at redhat.com> 6.5.7.3-4
 - Added xorg-x11-drv-ati-6.5.7.3-radeon-metamodes-SEGV-fix.patch from CVS HEAD.