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

xorg-x11-drivers.spec

@@ -1,7 +1,7 @@
 Summary: X.Org X11 driver installation package
 Name: xorg-x11-drivers
-Version: 7.7
+Version: 2021
-Release: 30%{?dist}
+Release: 1%{?dist}
 License: MIT
 
 # relevant hardware
@@ -11,6 +11,13 @@ Requires: xorg-x11-drv-evdev
 Requires: xorg-x11-drv-libinput
 Requires: xorg-x11-drv-modesetting
 
+# only non-s390x
+%ifnarch s390x
+Requires: xorg-x11-drv-fbdev
+%endif
+
+%if !0%{?rhel}
+
 %ifnarch aarch64 s390x
 Requires: xorg-x11-drv-qxl
 %endif
@@ -18,7 +25,6 @@ Requires: xorg-x11-drv-qxl
 # 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
@@ -39,10 +45,10 @@ Requires: xorg-x11-drv-intel
 Requires: xorg-x11-drv-vmware
 %endif
 
-%if !0%{?rhel}
 %ifarch %{ix86} x86_64
 Requires: xorg-x11-drv-openchrome
 %endif
+
 %endif
 
 %description
@@ -59,6 +65,10 @@ individual driver packages to be installed.
 %files
 
 %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
 - Don't Require wacom on s390x, that's just silly