Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/xorg-x11-drivers.git#8d88037a36e5360e4837bf4b6b8a68120a6641f5
This commit is contained in:
DistroBaker 2021-01-19 17:48:52 +00:00
parent 20defcd2c7
commit fe989a9acd

View File

@ -1,7 +1,7 @@
Summary: X.Org X11 driver installation package Summary: X.Org X11 driver installation package
Name: xorg-x11-drivers Name: xorg-x11-drivers
Version: 7.7 Version: 2021
Release: 30%{?dist} Release: 1%{?dist}
License: MIT License: MIT
# relevant hardware # relevant hardware
@ -11,6 +11,13 @@ Requires: xorg-x11-drv-evdev
Requires: xorg-x11-drv-libinput Requires: xorg-x11-drv-libinput
Requires: xorg-x11-drv-modesetting Requires: xorg-x11-drv-modesetting
# only non-s390x
%ifnarch s390x
Requires: xorg-x11-drv-fbdev
%endif
%if !0%{?rhel}
%ifnarch aarch64 s390x %ifnarch aarch64 s390x
Requires: xorg-x11-drv-qxl Requires: xorg-x11-drv-qxl
%endif %endif
@ -18,7 +25,6 @@ Requires: xorg-x11-drv-qxl
# only non-s390x # only non-s390x
%ifnarch s390x %ifnarch s390x
Requires: xorg-x11-drv-ati Requires: xorg-x11-drv-ati
Requires: xorg-x11-drv-fbdev
Requires: xorg-x11-drv-nouveau Requires: xorg-x11-drv-nouveau
Requires: xorg-x11-drv-v4l Requires: xorg-x11-drv-v4l
Requires: xorg-x11-drv-wacom Requires: xorg-x11-drv-wacom
@ -39,10 +45,10 @@ Requires: xorg-x11-drv-intel
Requires: xorg-x11-drv-vmware Requires: xorg-x11-drv-vmware
%endif %endif
%if !0%{?rhel}
%ifarch %{ix86} x86_64 %ifarch %{ix86} x86_64
Requires: xorg-x11-drv-openchrome Requires: xorg-x11-drv-openchrome
%endif %endif
%endif %endif
%description %description
@ -59,6 +65,10 @@ individual driver packages to be installed.
%files %files
%changelog %changelog
* Tue Jan 19 2021 Adam Jackson <ajax@redhat.com> - 2021-1
- Change package version to year + build
- Exclude most drivers from RHEL
* Tue Oct 27 2020 Adam Jackson <ajax@redhat.com> - 7.7-30 * Tue Oct 27 2020 Adam Jackson <ajax@redhat.com> - 7.7-30
- Don't Require wacom on s390x, that's just silly - Don't Require wacom on s390x, that's just silly