[xorg-x11-drivers] Only build vesa on arches where xserver builds VBE support

Adam Jackson ajax at fedoraproject.org
Wed Aug 15 16:21:05 UTC 2012


commit c3134dc8859938ddcb38c6a55a00a7f5ad2a799e
Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Aug 15 12:21:03 2012 -0400

    Only build vesa on arches where xserver builds VBE support

 xorg-x11-drivers.spec |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)
---
diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec
index 5ed318b..22be541 100644
--- a/xorg-x11-drivers.spec
+++ b/xorg-x11-drivers.spec
@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
 Version: 7.4
-Release: 9%{?dist}
+Release: 10%{?dist}
 License: MIT
 Group: User Interface/X Hardware Support
 
@@ -30,10 +30,14 @@ Requires: xorg-x11-drv-nouveau
 Requires: xorg-x11-drv-qxl
 Requires: xorg-x11-drv-synaptics
 Requires: xorg-x11-drv-v4l
-Requires: xorg-x11-drv-vesa
 Requires: xorg-x11-drv-void
 Requires: xorg-x11-drv-wacom
 
+# only build vesa on machines where we support vbe
+%ifarch %{ix86} x86_64
+Requires: xorg-x11-drv-vesa
+%endif
+
 # So far intel is onboard-only.
 %ifarch %{ix86} x86_64 ia64
 Requires: xorg-x11-drv-intel
@@ -125,6 +129,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 
 %changelog
+* Wed Aug 15 2012 Adam Jackson <ajax at redhat.com> 7.4-10
+- Only build vesa on arches where xserver builds VBE support
+
 * Sun Jul 22 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 7.4-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 


More information about the scm-commits mailing list