From 8aaad024b9fa8aeb6c181fc54ce29cf8126ce21b Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 18 May 2021 02:43:49 -0400 Subject: [PATCH] import xorg-x11-drivers-7.7-30.el8 --- SPECS/xorg-x11-drivers.spec | 56 +++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 21 deletions(-) diff --git a/SPECS/xorg-x11-drivers.spec b/SPECS/xorg-x11-drivers.spec index 1717a90..9acbae9 100644 --- a/SPECS/xorg-x11-drivers.spec +++ b/SPECS/xorg-x11-drivers.spec @@ -1,26 +1,28 @@ Summary: X.Org X11 driver installation package Name: xorg-x11-drivers Version: 7.7 -Release: 22%{?dist} +Release: 30%{?dist} License: MIT -Group: User Interface/X Hardware Support -ExcludeArch: s390 s390x +# relevant hardware -# relevant hardware - -Requires: xorg-x11-drv-ati Requires: xorg-x11-drv-dummy Requires: xorg-x11-drv-evdev Requires: xorg-x11-drv-libinput -Requires: xorg-x11-drv-fbdev Requires: xorg-x11-drv-modesetting -Requires: xorg-x11-drv-nouveau -%ifnarch aarch64 + +%ifnarch aarch64 s390x Requires: xorg-x11-drv-qxl %endif + +# only non-s390x +%ifnarch s390x +Requires: xorg-x11-drv-ati +Requires: xorg-x11-drv-fbdev +Requires: xorg-x11-drv-nouveau Requires: xorg-x11-drv-v4l Requires: xorg-x11-drv-wacom +%endif # only build vesa on machines where we support vbe %ifarch %{ix86} x86_64 @@ -38,21 +40,9 @@ Requires: xorg-x11-drv-vmware %endif %if !0%{?rhel} -# rhel-only exclusions that have maintainers in f21+: geode, openchrome - -# cyrix and nsc used to be here too, but are deprecated upstream and -# should eventually get folded into -geode. -%ifarch %{ix86} -Requires: xorg-x11-drv-geode -%endif - -# Thus far via chips are only on x86 and amd64 motherboards. This might be -# the driver that ends up supporting the S3 Chrome cards, so don't be -# surprised if this changes. %ifarch %{ix86} x86_64 Requires: xorg-x11-drv-openchrome %endif - %endif %description @@ -69,6 +59,30 @@ individual driver packages to be installed. %files %changelog +* Tue Oct 27 2020 Adam Jackson - 7.7-30 +- Don't Require wacom on s390x, that's just silly + +* Wed Jul 29 2020 Fedora Release Engineering - 7.7-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Feb 03 2020 Adam Jackson - 7.7-28 +- Drop geode, since F31+ no longer supports the associated CPU + +* Fri Jan 31 2020 Fedora Release Engineering - 7.7-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 7.7-26 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Wed Jul 17 2019 Dan Horák - 7.7-25 +- enable on s390x (related #1727029) + +* Sun Feb 03 2019 Fedora Release Engineering - 7.7-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 7.7-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Fri Feb 09 2018 Fedora Release Engineering - 7.7-22 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild