From 940b7843fee91d8f139b56bcd1feb95bd7e9ddb6 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 7 Jun 2021 16:46:57 +0200 Subject: .github/workflows/nx-libs.yml: In Fedora 34 and beyond, files from xorg-x11-xkb-utils-devel have been moved into bin:pkg xkbcomp-devel. --- .github/workflows/nx-libs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/nx-libs.yml b/.github/workflows/nx-libs.yml index fe5523166..14625feb1 100644 --- a/.github/workflows/nx-libs.yml +++ b/.github/workflows/nx-libs.yml @@ -110,7 +110,7 @@ jobs: xorg-x11-font-utils libtirpc-devel xkeyboard-config # soft requirements dnf -y install \ - quilt xorg-x11-xkb-utils-devel + quilt xkbcomp-devel ;; centos:8) # Enable powertools repository for imake -- cgit v1.2.3 From bbc59f214285d413f1ede891c62e03d898667b3f Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 7 Jun 2021 16:49:21 +0200 Subject: nx-libs.spec: In Fedora 34 and beyond, files from xorg-x11-xkb-utils-devel have been moved into bin:pkg xkbcomp-devel. --- nx-libs.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nx-libs.spec b/nx-libs.spec index 8fe59f810..84140f381 100644 --- a/nx-libs.spec +++ b/nx-libs.spec @@ -41,8 +41,12 @@ BuildRequires: imake BuildRequires: xkbcomp-devel %endif %else +%if 0%{?fedora} >= 34 +BuildRequires: xkbcomp-devel +%else BuildRequires: xorg-x11-xkb-utils-devel %endif +%endif # ideally we build with quilt (for mesa-quilt patch appliance script), # it seems Fedora has it... -- cgit v1.2.3