rpms/xorg-x11-drv-i810/devel .cvsignore, 1.7, 1.8 sources, 1.7, 1.8 xorg-x11-drv-i810.spec, 1.12, 1.13 more-libcunwrap.patch, 1.1, NONE

[fedora-cvs-commits at redhat.com]

Author: ajackson

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

Modified Files:
	.cvsignore sources xorg-x11-drv-i810.spec 
Removed Files:
	more-libcunwrap.patch 
Log Message:
auto-import xorg-x11-drv-i810-1.6.0-1 on branch devel from xorg-x11-drv-i810-1.6.0-1.src.rpm


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	23 Mar 2006 00:23:58 -0000	1.7
+++ .cvsignore	10 Apr 2006 03:19:10 -0000	1.8
@@ -1 +1 @@
-xf86-video-i810-cvs20060322.tar.bz2
+xf86-video-i810-1.6.0.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sources	23 Mar 2006 00:23:58 -0000	1.7
+++ sources	10 Apr 2006 03:19:10 -0000	1.8
@@ -1 +1 @@
-66c0253452e4925720b68ea2d5d6f02e  xf86-video-i810-cvs20060322.tar.bz2
+0d3db819b9617a576927fd1aebe5ab81  xf86-video-i810-1.6.0.tar.bz2


Index: xorg-x11-drv-i810.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-drv-i810/devel/xorg-x11-drv-i810.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- xorg-x11-drv-i810.spec	4 Apr 2006 18:42:34 -0000	1.12
+++ xorg-x11-drv-i810.spec	10 Apr 2006 03:19:10 -0000	1.13
@@ -1,15 +1,15 @@
-%define tarball xf86-video-i810-%{cvsdate}
+%define tarball xf86-video-i810
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir	%{moduledir}/drivers
 
-%define cvsdate cvs20060322
+#%define cvsdate cvs20060322
 
 Summary:   Xorg X11 i810 video driver
 Name:      xorg-x11-drv-i810
-Version:   1.4.1.3
-Release:   4.%{cvsdate}.1
+Version:   1.6.0
+Release:   1
 URL:       http://www.x.org
-Source0:   http://xorg.freedesktop.org/X11R7.0/src/driver/%{tarball}.tar.bz2
+Source0:   http://xorg.freedesktop.org/releases/individual/driver/%{tarball}-%{version}.tar.bz2
 Source1:   i810.xinf
 License:   MIT/X11
 Group:     User Interface/X Hardware Support
@@ -18,12 +18,12 @@
 ExclusiveArch: %{ix86} x86_64 ia64
 
 BuildRequires: pkgconfig
-BuildRequires: xorg-x11-server-sdk
+BuildRequires: xorg-x11-server-sdk >= 1.0.99.901
 BuildRequires: libXvMC-devel
 
-Requires:  xorg-x11-server-Xorg
+Requires:  xorg-x11-server-Xorg >= 1.0.99.901
 
-Patch0: more-libcunwrap.patch
+#Patch0: more-libcunwrap.patch
 
 %description 
 X.Org X11 i810 video driver.
@@ -37,9 +37,9 @@
 X.Org X11 i810 video driver XvMC development package.
 
 %prep
-%setup -q -n %{tarball}
+%setup -q -n %{tarball}-%{version}
 
-%patch0 -p1 -b .more-libcunwrap
+#%patch0 -p1 -b .more-libcunwrap
 
 %build
 %configure --disable-static
@@ -78,6 +78,9 @@
 %{_libdir}/libI810XvMC.so
 
 %changelog
+* Sun Apr  9 2006 Adam Jackson <ajackson at redhat.com> 1.6.0-1
+- Update to 1.6.0 from 7.1RC1.
+
 * Tue Apr  4 2006 Kristian Høgsberg <krh at redhat.com> 1.4.1.3-4.cvs20060322.1
 - Add patch to add missing #include's, specifically assert.h.
 


--- more-libcunwrap.patch DELETED ---