[rpms/python-pyperclip] epel10.3: Use xwayland-run for tests where we can

[rpms/python-pyperclip] epel10.3: Use xwayland-run for tests where we can

[Benjamin A. Beasley]

A new commit has been pushed.

Repo   : rpms/python-pyperclip
Branch : epel10.3
Commit : 1a9904a97a0efd025196673b7ed392f1267ee10a
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-10T13:01:41+01:00
Stats  : +20/-3 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/python-pyperclip/c/1a9904a97a0efd025196673b7ed392f1267ee10a?branch=epel10.3

Log:
Use xwayland-run for tests where we can

---
diff --git a/python-pyperclip.spec b/python-pyperclip.spec
index 3c5c24c..574a3e0 100644
--- a/python-pyperclip.spec
+++ b/python-pyperclip.spec
@@ -3,6 +3,12 @@
 #
 # We can generate PDF documentation as a substitute.
 %bcond_without doc_pdf
+# Test with XWayland, instead of X11?
+%if %{undefined el8} && %{undefined el9}
+%bcond_without wayland
+%else
+%bcond_with wayland
+%endif
 
 Name:           python-pyperclip
 Version:        1.9.0
@@ -37,7 +43,11 @@ BuildRequires:  python3dist(setuptools)
 BuildRequires:  python3dist(pytest)
 
 # Support graphical tests in non-graphical environment
+%if %{with wayland}
+BuildRequires:  xwayland-run
+%else
 BuildRequires:  xorg-x11-server-Xvfb
+%endif
 
 # TestQt (module PyQt5.QtWidgets)
 BuildRequires:  python3dist(pyqt5)
@@ -50,13 +60,15 @@ BuildRequires:  /usr/bin/xclip
 # figure out why.
 # BuildRequires:  /usr/bin/xsel
 
+%if %{with wayland}
 # TestWlClipboard (executables wl-copy/wl-paste)
 # This only works in a Wayland session; otherwise, we get:
 #   error: XDG_RUNTIME_DIR is invalid or not set in the environment.
 #   Failed to connect to a Wayland server: No such file or directory
 #   Note: WAYLAND_DISPLAY is unset (falling back to wayland-0)
-# BuildRequires:  /usr/bin/wl-copy
-# BuildRequires:  /usr/bin/wl-paste
+BuildRequires:  /usr/bin/wl-copy
+BuildRequires:  /usr/bin/wl-paste
+%endif
 
 # TestKlipper (executables klipper and qdbus)
 # These would fail with:
@@ -76,7 +88,7 @@ Summary:        Pyperclip documentation
 %if %{with doc_pdf}
 BuildRequires:  make
 BuildRequires:  python3dist(sphinx)
-%if ! 0%{?el8}
+%if %{undefined el8}
 BuildRequires:  python3-sphinx-latex
 %else
 BuildRequires:  tex(amsmath.sty)
@@ -133,7 +145,11 @@ PYTHONPATH="${PWD}/src" %make_build -C docs latex \
 %py3_install
 
 %check
+%if %{with wayland}
+%global __pytest /usr/bin/xwfb-run -- pytest
+%else
 %global __pytest /usr/bin/xvfb-run -a %{python3} -m pytest
+%endif
 # Explicitly skip backends that we know will fail in the mock environment if
 # their dependencies happen to be present. See notes in the BuildRequires.
 k="${k-}${k+ and }not TestKlipper"
@@ -158,6 +174,7 @@ k="${k-}${k+ and }not TestXSel"
 %changelog
 * Thu Sep 10 2026 Benjamin A. Beasley <code@musicinmybrain.net> - 1.9.0-1
 - Update to 1.9.0
+- Use xwayland-run for tests where we can
 
 * Thu Jul 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.2-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild