public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/plplot] rawhide: Test with xwayland-run
@ 2026-08-05 14:50 Yaakov Selkowitz
  0 siblings, 0 replies; only message in thread
From: Yaakov Selkowitz @ 2026-08-05 14:50 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/plplot
Branch : rawhide
Commit : 076ef2dfef088252041326c8c158aac394929ca4
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date   : 2026-08-02T23:55:12-04:00
Stats  : +8/-1 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/plplot/c/076ef2dfef088252041326c8c158aac394929ca4?branch=rawhide

Log:
Test with xwayland-run

---
diff --git a/plplot.spec b/plplot.spec
index 6938773..8640616 100644
--- a/plplot.spec
+++ b/plplot.spec
@@ -182,11 +182,16 @@ BuildRequires:  python3dist(pyqt-builder)
 BuildRequires:  python3dist(sip) >= 5
 BuildRequires:  python3-qt5-devel
 BuildRequires:  shapelib-devel
-# For %check
+# For %%check
 %if %{with check}
+%if 0%{?fedora} || 0%{?rhel} >= 10
+%global __ctest xwfb-run -- %{__ctest}
+BuildRequires:  xwayland-run
+%else
 BuildRequires:  xorg-x11-drv-dummy
 BuildRequires:  mesa-dri-drivers
 %endif
+%endif
 BuildRequires:  chrpath
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 Requires:       gnu-free-mono-fonts
@@ -517,6 +522,7 @@ find $RPM_BUILD_ROOT%{_datadir}/plplot%{version}/examples -type f | xargs chmod 
 
 %if %{with check}
 %check
+%if ! (0%{?fedora} || 0%{?rhel} >= 10)
 cp %SOURCE1 .
 if [ -x /usr/libexec/Xorg ]; then
    Xorg=/usr/libexec/Xorg
@@ -525,6 +531,7 @@ else
 fi
 $Xorg -noreset +extension GLX +extension RANDR +extension RENDER -nolisten tcp -nolisten unix -logfile ./xorg.log -config ./xorg.conf -configdir . :99 &
 export DISPLAY=:99
+%endif
 # Help bytecode-only arches find the OCaml stublib
 export LD_LIBRARY_PATH=$PWD/%{_vpath_builddir}/bindings/ocaml:$RPM_BUILD_ROOT%{_libdir}
 # Exclude ocaml from ppc/ppc64/ppc64le, arm, riscv64

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-08-05 14:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-08-05 14:50 [rpms/plplot] rawhide: Test with xwayland-run Yaakov Selkowitz

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox