rpms/xorg-x11-drv-intel/F-11 xorg-x11-drv-intel.spec,1.15,1.16

[Kristian Høgsberg]

Author: krh

Update of /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31586

Modified Files:
	xorg-x11-drv-intel.spec 
Log Message:
* Wed May  6 2009  <krh at madara.bos.redhat.com> - 2.7.0-3
- Pull in fixes from the 2.7 branch.



Index: xorg-x11-drv-intel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-intel/F-11/xorg-x11-drv-intel.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- xorg-x11-drv-intel.spec	23 Apr 2009 14:55:06 -0000	1.15
+++ xorg-x11-drv-intel.spec	6 May 2009 19:01:24 -0000	1.16
@@ -7,7 +7,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.7.0
-Release:   2%{?dist}
+Release:   3%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -21,8 +21,8 @@ Source3:    intel-gpu-tools-%{gputoolsda
 Patch1: kill-svideo.patch
 Patch2: copy-fb.patch
 
-# not in 2.7 but in master, http://bugs.freedesktop.org/21254
-Patch10: intel-2.7-kms-output-properties.patch
+# patches from 2.7 branch
+Patch10: intel-2.7-fixes.patch
 
 # needs to be upstreamed
 Patch20: intel-2.6.99.902-kms-get-crtc.patch
@@ -69,7 +69,7 @@ Debugging tools for Intel graphics chips
 %setup -q -n xf86-video-intel-%{version} -b3
 %patch1 -p1 -b .svideo
 %patch2 -p1 -b .copy-fb
-%patch10 -p1 -b .kms-props
+%patch10 -p1 -b .2.7-fixes
 %patch20 -p1 -b .get-crtc
 # notyet.  we don't handle switching in and out of tiled front buffer
 # correctly yet, so let's not have people stumble into it more than
@@ -127,6 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/intel_*
 
 %changelog
+* Wed May  6 2009  <krh at madara.bos.redhat.com> - 2.7.0-3
+- Pull in fixes from the 2.7 branch.
+
 * Thu Apr 23 2009 Adam Jackson <ajax at redhat.com> 2.7.0-2
 - Add intel-gpu-tools subpackage