From 8d88037a36e5360e4837bf4b6b8a68120a6641f5 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 19 Jan 2021 12:31:47 -0500 Subject: [PATCH] Change package version to year + build Exclude most drivers from RHEL --- xorg-x11-drivers.spec | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/xorg-x11-drivers.spec b/xorg-x11-drivers.spec index 9acbae9..8dcba39 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.7 -Release: 30%{?dist} +Version: 2021 +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 - 2021-1 +- Change package version to year + build +- Exclude most drivers from RHEL + * Tue Oct 27 2020 Adam Jackson - 7.7-30 - Don't Require wacom on s390x, that's just silly