]> source.dussan.org Git - tigervnc.git/commitdiff
Preinstall xorg-x11-server-devel for CentOS builds
authorPierre Ossman <ossman@cendio.se>
Fri, 14 Oct 2022 07:05:17 +0000 (09:05 +0200)
committerPierre Ossman <ossman@cendio.se>
Fri, 14 Oct 2022 07:29:31 +0000 (09:29 +0200)
This is needed to correctly handle the spec file, so it needs to be
installed before we parse it for build dependencies.

.github/containers/centos7/build.sh
.github/containers/centos8/build.sh

index 0e848701561e91506e38d09d9c1799b9146d6c2f..c26d7bcb5728b4961c81a63ec0020312b48f1f44 100755 (executable)
@@ -33,6 +33,7 @@ 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 yum install -y xorg-x11-server-devel;
        sudo yum-builddep -y ~/rpmbuild/SPECS/tigervnc.spec;
        sudo chown 0.0 ~/rpmbuild/SOURCES/*;
        sudo chown 0.0 ~/rpmbuild/SPECS/*;
index 1e5e0d8f428938af05e4441c7c1d32c082d53e6e..d56eb62c11cc56a29e59718270108834a0523401 100755 (executable)
@@ -33,6 +33,7 @@ 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 builddep -y ~/rpmbuild/SPECS/tigervnc.spec;
        sudo chown 0.0 ~/rpmbuild/SOURCES/*;
        sudo chown 0.0 ~/rpmbuild/SPECS/*;