From b4de8a55b10ae780aa862acd7bbf16f5d18aa97b Mon Sep 17 00:00:00 2001
From: Antoine Martin <antoine@xpra.org>
Date: Mon, 13 Jan 2025 21:56:24 +0700
Subject: [PATCH] simplify: just always build all the client packages

some may not install without third party packages (ie: PyQt6) and that's ok
---
 packaging/rpm/xpra.spec | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/packaging/rpm/xpra.spec b/packaging/rpm/xpra.spec
index 698fe90991..2f6ab1be2d 100644
--- a/packaging/rpm/xpra.spec
+++ b/packaging/rpm/xpra.spec
@@ -30,22 +30,13 @@ autoprov: no
 %define python3_sitearch %(%{python3} -Ic "from sysconfig import get_path; print(get_path('platlib').replace('/usr/local/', '/usr/'))" 2> /dev/null)
 %endif
 
-%define qt6 1
-%define tk 1
-%define pyglet 1
 %define CFLAGS -O2
-%define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-evdi --without-cuda_rebuild
-%if 0%{?fedora}
-%global debug_package %{nil}
-%endif
-%if 0%{?fedora}
-%define qt6 1
 %define DEFAULT_BUILD_ARGS --with-Xdummy --without-Xdummy_wrapper --without-evdi --without-cuda_rebuild --with-qt6_client --with-pyglet_client --with-tk_client
+%if 0%{?fedora}0%{?el10}
+%global debug_package %{nil}
 %endif
 %if 0%{?el10}
-%define qt6 1
-%global debug_package %{nil}
-%define DEFAULT_BUILD_ARGS --without-evdi --without-cuda_rebuild --with-qt6_client --without-docs
+%define DEFAULT_BUILD_ARGS --without-evdi --without-cuda_rebuild --with-qt6_client --with-pyglet_client --with-tk_client --without-docs
 %endif
 
 %global gnome_shell_extension input-source-manager@xpra_org
@@ -364,27 +355,22 @@ BuildRequires:		xclip
 This package contains the GTK3 xpra client.
 
 
-%if 0%{qt6}
 %package -n %{package_prefix}-client-qt6
 Summary:			Experimental xpra Qt6 client
 Requires:			%{package_prefix}-client = %{version}-%{release}
 Requires:			%{python3}-pyqt6
 %description -n%{package_prefix}-client-qt6
 This package contains an experimental client using the Qt6 toolkit.
-%endif
 
 
-%if 0%{?pyglet}
 %package -n %{package_prefix}-client-pyglet
 Summary:			Experimental xpra pyglet client
 Requires:			%{package_prefix}-client = %{version}-%{release}
 Requires:			%{python3}-pyglet
 %description -n%{package_prefix}-client-pyglet
 This package contains an experimental client using the pyglet toolkit.
-%endif
 
 
-%if 0%{?tk}
 %package -n %{package_prefix}-client-tk
 Summary:			Experimental xpra tk client
 Requires:			%{package_prefix}-client = %{version}-%{release}
@@ -392,7 +378,6 @@ Requires:			%{python3}-tkinter
 Requires:			%{python3}-pillow-tk
 %description -n%{package_prefix}-client-tk
 This package contains an experimental client using the tkinter toolkit.
-%endif
 
 
 %package -n %{package_prefix}-client-gnome
@@ -748,20 +733,14 @@ rm -rf $RPM_BUILD_ROOT
 %{python3_sitearch}/xpra/client/base/
 %pycached %{python3_sitearch}/xpra/client/__init__.py
 
-%if 0%{?qt6}
 %files -n %{package_prefix}-client-qt6
 %{python3_sitearch}/xpra/client/qt6/
-%endif
 
-%if 0%{?pyglet}
 %files -n %{package_prefix}-client-pyglet
 %{python3_sitearch}/xpra/client/pyglet/
-%endif
 
-%if 0%{?tk}
 %files -n %{package_prefix}-client-tk
 %{python3_sitearch}/xpra/client/tk/
-%endif
 
 %files -n %{package_prefix}-client-gtk3
 %{python3_sitearch}/xpra/client/gui/