[xorg-x11-drv-intel] Disable UMS support in F21+

Adam Jackson ajax at fedoraproject.org
Thu Oct 24 20:40:45 UTC 2013


commit d20cc6569d3f3b597c3e017f43a959c0a9517aea
Author: Adam Jackson <ajax at redhat.com>
Date:   Thu Oct 24 16:40:51 2013 -0400

    Disable UMS support in F21+

 xorg-x11-drv-intel.spec |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index 0948982..480586d 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -15,6 +15,10 @@
 %define prime 1
 %endif
 
+%if 0%{?rhel7} || 0%{?fedora} > 20
+%define kmsonly 1
+%endif
+
 #if 0%{?rhel7} || 0%{?fedora} > 19
 %if 0
 %define accel sna
@@ -25,7 +29,7 @@
 Summary:   Xorg X11 Intel video driver
 Name:      xorg-x11-drv-intel
 Version:   2.21.15
-Release:   5%{?gitrev}%{?dist}
+Release:   6%{?gitrev}%{?dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X Hardware Support
@@ -99,10 +103,12 @@ Debugging tools for Intel graphics chips
 autoreconf -v --install
 
 %configure \
+%if !0%{rhel7}
 %ifnarch %{ix86}
     --enable-kms-only \
 %endif
-    %{?rhel7:--enable-kms-only} \
+%endif
+    %{?kmsonly:--enable-kms-only} \
     --disable-static \
     --enable-dri \
     --enable-xvmc \
@@ -162,6 +168,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man1/intel_*.1*
 
 %changelog
+* Thu Oct 24 2013 Adam Jackson <ajax at redhat.com> 2.21.15-6
+- Disable UMS support in F21+
+
 * Thu Oct 24 2013 Adam Jackson <ajax at redhat.com> 2.21.15-5
 - xserver 1.15 API compat
 


More information about the scm-commits mailing list