[xorg-x11-drv-intel/f15/master] make copy-fb patch build again

Ray Strode rstrode at fedoraproject.org
Mon Mar 14 16:35:54 UTC 2011


commit 5a922a8883b7a23e869fb5c88a51025f86712adb
Author: Ray Strode <rstrode at redhat.com>
Date:   Mon Mar 14 12:33:34 2011 -0400

    make copy-fb patch build again

 xorg-x11-drv-intel.spec |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index c87722b..8f65e14 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -6,7 +6,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.14.0
-Release:   3%{?dist}
+Release:   4%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -20,7 +20,7 @@ Source4:    make-git-snapshot.sh
 
 # deactivated for now, maybe no longer needed
 Patch1: kill-svideo.patch
-# port me dangit
+# upstream me dangit
 Patch2: copy-fb.patch
 # needs to be upstreamed
 Patch22: intel-2.11.0-vga-clock-max.patch
@@ -75,6 +75,7 @@ Debugging tools for Intel graphics chips
 
 %prep
 %setup -q -n xf86-video-intel-%{dirsuffix} -b3
+%patch2 -p1 -b .copy-fb
 %patch22 -p1 -b .vga-clock
 #patch62 -p1 -b .no-flip
 
@@ -130,6 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Mon Mar 14 2011 Ray Strode <rstrode at redhat.com> 2.14.0-4
+- Make copy-fb patch build again
+
 * Thu Mar 10 2011 Adam Jackson <ajax at redhat.com> - 2.14.0-3
 - xserver 1.10 ABI rebuild
 


More information about the scm-commits mailing list