diff --git a/SPECS/xorg-x11-server.spec b/SPECS/xorg-x11-server.spec index 9f9a5eb..b631644 100644 --- a/SPECS/xorg-x11-server.spec +++ b/SPECS/xorg-x11-server.spec @@ -46,7 +46,7 @@ Summary: X.Org X11 X server Name: xorg-x11-server Version: 1.20.3 -Release: 5%{?gitdate:.%{gitdate}}%{?dist} +Release: 5.2%{?gitdate:.%{gitdate}}%{?dist} URL: http://www.x.org License: MIT Group: User Interface/X @@ -199,6 +199,12 @@ Obsoletes: xorg-x11-drv-vmmouse < 13.1.0-4 Requires: xorg-x11-server-common >= %{version}-%{release} Requires: system-setup-keyboard Requires: xorg-x11-drv-libinput +%ifnarch s390 s390x +Requires: xorg-x11-drv-fbdev +%ifarch x86_64 +Requires: xorg-x11-drv-vesa +%endif +%endif Requires: libEGL %description Xorg @@ -545,7 +551,13 @@ find %{inst_srcdir}/hw/xfree86 -name \*.c -delete %changelog -* Mon Jan 14 2019 Ben Crocker - 1.20.3-4 +* Wed Apr 10 2019 Adam Jackson - 1.20.3-5.2 +- Don't require fbdev on s390x, where it doesn't exist + +* Wed Apr 03 2019 Adam Jackson - 1.20.3-5.1 +- Add Requires: fbdev (and on x86_64, vesa) to Xorg subpackage + +* Mon Jan 14 2019 Ben Crocker - 1.20.3-5 - Add Eric Anholt's patch e50c85f4ebf559 from upstream: - Fix segfault on probing a non-PCI platform device on a system with PCI - NOTE: also pertains on a system with no PCI, e.g. s390x.