public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/python-pyperclip] epel8: Diverge the EPEL8 branch and drop conditionals
@ 2026-09-21 14:27 Benjamin A. Beasley
  0 siblings, 0 replies; only message in thread
From: Benjamin A. Beasley @ 2026-09-21 14:27 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/python-pyperclip
Branch : epel8
Commit : fd1162af888836bef3d7f3f7de7eb42a05f08a46
Author : Benjamin A. Beasley <code@musicinmybrain.net>
Date   : 2026-09-21T15:00:14+01:00
Stats  : +2/-30 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/python-pyperclip/c/fd1162af888836bef3d7f3f7de7eb42a05f08a46?branch=epel8

Log:
Diverge the EPEL8 branch and drop conditionals

---
diff --git a/python-pyperclip.spec b/python-pyperclip.spec
index 9393fc2..5ff0232 100644
--- a/python-pyperclip.spec
+++ b/python-pyperclip.spec
@@ -3,12 +3,6 @@
 #
 # 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
@@ -45,11 +39,7 @@ 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)
@@ -62,16 +52,6 @@ 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
-%endif
-
 # TestKlipper (executables klipper and qdbus)
 # These would fail with:
 #   Could not connect to D-Bus server:
@@ -90,9 +70,8 @@ Summary:        Pyperclip documentation
 %if %{with doc_pdf}
 BuildRequires:  make
 BuildRequires:  python3dist(sphinx)
-%if %{undefined el8}
-BuildRequires:  python3-sphinx-latex
-%else
+BuildRequires:  latexmk
+# Equivalent to python3-sphinx-latex deps. in EPEL9 and later.
 BuildRequires:  tex(amsmath.sty)
 BuildRequires:  tex(amsthm.sty)
 BuildRequires:  tex(anyfontsize.sty)
@@ -122,8 +101,6 @@ BuildRequires:  texlive-collection-latex
 BuildRequires:  texlive-dvipng
 BuildRequires:  texlive-dvisvgm
 %endif
-BuildRequires:  latexmk
-%endif
 
 %description -n python-pyperclip-doc
 Documentation for pyperclip
@@ -146,11 +123,7 @@ 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"
@@ -175,7 +148,6 @@ 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
 - Also fix end-of-line encodings in AUTHORS.txt and CHANGES.txt
 
 * Tue Nov 29 2022 Benjamin A. Beasley <code@musicinmybrain.net> - 1.8.2-3

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

only message in thread, other threads:[~2026-09-21 14:27 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-09-21 14:27 [rpms/python-pyperclip] epel8: Diverge the EPEL8 branch and drop conditionals Benjamin A. Beasley

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