Move away from xvfb-run

Backport: https://src.fedoraproject.org/rpms/libglvnd/pull-request/3
Resolves: https://issues.redhat.com/browse/RHEL-36640
This commit is contained in:
José Expósito 2024-08-07 11:48:50 +02:00
parent 14ac710a42
commit 07a75d1b57

View File

@ -4,7 +4,7 @@
Name: libglvnd Name: libglvnd
Version: 1.7.0 Version: 1.7.0
Release: 5%{?dist} Release: 6%{?dist}
# Provide an upgrade path from the negativo17.org pkgs which have Epoch 1 # Provide an upgrade path from the negativo17.org pkgs which have Epoch 1
Epoch: 1 Epoch: 1
Summary: The GL Vendor-Neutral Dispatch library Summary: The GL Vendor-Neutral Dispatch library
@ -22,7 +22,10 @@ BuildRequires: python3-libxml2
BuildRequires: pkgconfig(glproto) BuildRequires: pkgconfig(glproto)
BuildRequires: pkgconfig(x11) BuildRequires: pkgconfig(x11)
BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xext)
BuildRequires: xorg-x11-server-Xvfb # X11 testing
BuildRequires: mesa-dri-drivers
BuildRequires: mutter
BuildRequires: xwayland-run
%{?_without_mesa_glvnd_default: %{?_without_mesa_glvnd_default:
%global __provides_exclude_from %{_libdir}/%{name} %global __provides_exclude_from %{_libdir}/%{name}
@ -161,7 +164,7 @@ mkdir -p %{buildroot}%{_datadir}/egl/egl_external_platform.d/
%check %check
export DO_X11_TESTS=1 export DO_X11_TESTS=1
xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \ xwfb-run -c mutter make check V=1 || \
%ifarch s390x ppc64 %ifarch s390x ppc64
: :
%else %else
@ -240,6 +243,9 @@ xvfb-run -s '-screen 0 640x480x24' -d make check V=1 || \
%changelog %changelog
* Wed Aug 07 2024 José Expósito <jexposit@redhat.com> - 1:1.7.0-6
- Move away from xvfb-run
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-5 * Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1:1.7.0-5
- Bump release for June 2024 mass rebuild - Bump release for June 2024 mass rebuild