diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-07 20:09:22 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2021-06-07 20:09:22 +0200 |
| commit | 90728fadcd845a4017722ffa51f43ce7939e6121 (patch) | |
| tree | c0f659525755968d68b37927d42013d275f4c874 | |
| parent | 5c09159aed997498d2f59f8d4025811f363586c0 (diff) | |
| parent | bbc59f214285d413f1ede891c62e03d898667b3f (diff) | |
| download | nx-libs-90728fadcd845a4017722ffa51f43ce7939e6121.tar.gz nx-libs-90728fadcd845a4017722ffa51f43ce7939e6121.tar.bz2 nx-libs-90728fadcd845a4017722ffa51f43ce7939e6121.zip | |
Merge branch 'sunweaver-pr/fix-ci-builds-against-fedora-greater-than-33' into 3.6.x
Attributes GH PR #1017: https://github.com/ArcticaProject/nx-libs/pull/1017
| -rw-r--r-- | .github/workflows/nx-libs.yml | 2 | ||||
| -rw-r--r-- | nx-libs.spec | 4 |
2 files changed, 5 insertions, 1 deletions
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 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... |