This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goplasmabindings. commit 712f6f1c0892dda9933f2e6f7b8e0fe480a4adc1 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Apr 24 22:46:51 2023 +0200 x2goplasmabindings.spec: prepare for Plasma 5 support. --- debian/changelog | 4 +++- x2goplasmabindings.spec | 32 +++++++++++++++++++++++++++++++- 2 files changed, 34 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index d8baaa2..9aeb003 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ x2goplasmabindings (3.0.2.3-0x2go1) UNRELEASED; urgency=medium - * Continue development + [ Mihai Moldovan ] + * New upstream version (3.0.2.3): + - x2goplasmabindings.spec: prepare for Plasma 5 support. -- X2Go Release Manager <git-admin@x2go.org> Thu, 22 Nov 2018 00:21:33 +0100 diff --git a/x2goplasmabindings.spec b/x2goplasmabindings.spec index 1ca1a93..8d55efe 100644 --- a/x2goplasmabindings.spec +++ b/x2goplasmabindings.spec @@ -1,3 +1,14 @@ +# Choose between KDE 4 and 5. +%global plasma5 0 +%if 0%{?suse_version} +%if 0%{?sle_version} >= 150300 +%global plasma5 1 +%endif +%endif +%if 0%{?fedora} >= 38 +%global plasma5 1 +%endif + Name: x2goplasmabindings Summary: Plasma widget for control X2Go sessions Group: Applications/Communications @@ -16,11 +27,19 @@ Source0: https://code.x2go.org/releases/source/%{name}/%{name}-%{version} BuildRequires: cmake %if 0%{?suse_version} BuildRequires: kde4-filesystem +%if 0%{?plasma5} +BuildRequires: plasma-framework-devel +%else BuildRequires: libkde4-devel +%endif %else BuildRequires: kde-filesystem +%if 0%{?plasma5} +BuildRequires: kf5-plasma-devel +%els BuildRequires: kdelibs4-devel %endif +%endif BuildRequires: intltool Requires: plasma-addons-x2go @@ -43,7 +62,11 @@ X2Go is a server-based computing environment with - audio support - authentication by smartcard and USB stick +%if 0%{?plasma5} +This package adds a plasma widget (KDE5) for controlling your +%else This package adds a plasma widget (KDE4) for controlling your +%endif X2Go session. %package -n plasma-addons-x2go @@ -62,7 +85,11 @@ X2Go is a server-based computing environment with - audio support - authentication by smartcard and USB stick +%if 0%{?plasma5} +This package adds a plasma widget (KDE5) for controlling your +%else This package adds a plasma widget (KDE4) for controlling your +%endif X2Go session. %prep @@ -80,7 +107,10 @@ cmake .. \ -DKDE4_PLASMA_LIBS="%_libdir/kde4" \ -DPLUGIN_INSTALL_DIR="%_libdir/kde4" \ -DCMAKE_C_FLAGS:STRING="%optflags" \ - -DCMAKE_CXX_FLAGS:STRING="%optflags" + -DCMAKE_CXX_FLAGS:STRING="%optflags" \ +%if 0%{?plasma5} + -DUSE_PLASMA5="ON" +%endif make %{?_smp_mflags} -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goplasmabindings.git