From e93e2e4dffd2dde85021fc1d6f091e7d05e19e47 Mon Sep 17 00:00:00 2001 From: Pierre Ossman Date: Tue, 20 Jun 2023 16:29:47 +0200 Subject: [PATCH] Drop xorg-x11-font-utils requirement for RHEL 9 They've patched their Xorg sources to no longer require this package. --- .github/containers/rocky9/build.sh | 1 - contrib/packages/rpm/el9/SPECS/tigervnc.spec | 1 - 2 files changed, 2 deletions(-) diff --git a/.github/containers/rocky9/build.sh b/.github/containers/rocky9/build.sh index 0284ff1f..320fceb7 100755 --- a/.github/containers/rocky9/build.sh +++ b/.github/containers/rocky9/build.sh @@ -34,7 +34,6 @@ sed -i "s/@VERSION@/${VERSION}/" ${CURDIR}/rpmbuild/SPECS/tigervnc.spec docker run --volume ${CURDIR}/rpmbuild:/home/rpm/rpmbuild --interactive --rm tigervnc/${DOCKER} \ bash -e -x -c " sudo dnf install -y xorg-x11-server-devel - sudo dnf install -y https://kojihub.stream.centos.org/kojifiles/packages/xorg-x11-font-utils/7.5/53.el9/x86_64/xorg-x11-font-utils-7.5-53.el9.x86_64.rpm sudo dnf builddep -y ~/rpmbuild/SPECS/tigervnc.spec sudo chown 0.0 ~/rpmbuild/SOURCES/* sudo chown 0.0 ~/rpmbuild/SPECS/* diff --git a/contrib/packages/rpm/el9/SPECS/tigervnc.spec b/contrib/packages/rpm/el9/SPECS/tigervnc.spec index fa8e7ff7..a58d1c50 100644 --- a/contrib/packages/rpm/el9/SPECS/tigervnc.spec +++ b/contrib/packages/rpm/el9/SPECS/tigervnc.spec @@ -30,7 +30,6 @@ BuildRequires: libXdamage-devel, libXrandr-devel, libXt-devel, libXdmcp-devel BuildRequires: libXinerama-devel, mesa-libGL-devel, libxshmfence-devel BuildRequires: pixman-devel, libdrm-devel, BuildRequires: xorg-x11-util-macros, xorg-x11-xtrans-devel, libXtst-devel -BuildRequires: xorg-x11-font-utils BuildRequires: libXfont2-devel # SELinux BuildRequires: libselinux-devel, selinux-policy-devel, systemd -- 2.39.5