Skip to content

Commit

Permalink
simplify: just always build all the client packages
Browse files Browse the repository at this point in the history
some may not install without third party packages (ie: PyQt6) and that's ok
  • Loading branch information
totaam committed Jan 13, 2025
1 parent 7d13e15 commit b4de8a5
Showing 1 changed file with 3 additions and 24 deletions.
27 changes: 3 additions & 24 deletions packaging/rpm/xpra.spec
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -364,35 +355,29 @@ 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}
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
Expand Down Expand Up @@ -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/
Expand Down

0 comments on commit b4de8a5

Please sign in to comment.