[X2Go-Commits] [x2goserver] 03/03: x2goserver.spec: exclude KDrive support for old Fedora, RHEL/CentOS/... and *SuSE distribution versions.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2goserver.

commit a16690711b8c46d987783b7fa4e23bb93e595c97
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu May 25 22:06:34 2023 +0200

    x2goserver.spec: exclude KDrive support for old Fedora, RHEL/CentOS/... and *SuSE distribution versions.
---
 debian/changelog |  2 ++
 x2goserver.spec  | 23 +++++++++++++++++++++++
 2 files changed, 25 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b02760e4..c99f7344 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -463,6 +463,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     + Add R: x2goserver-x2gokdrive to x2goserver package, to always pull it in
       as a dependency. This means that we MUST also provide the KDrive server
       for the platforms that we provide X2Go Server for.
+    + Exclude KDrive support for old Fedora, RHEL/CentOS/... and *SuSE
+      distribution versions.
   * debian/x2goserver.install:
     + Install bin/x2goupdateoptionsstring.
     + Rename x2goupdateoptionsstring to x2gooptionsstring.
diff --git a/x2goserver.spec b/x2goserver.spec
index e8c32a04..59fe59a7 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,3 +1,20 @@
+%define         support_kdrive 1
+
+# Disable KDrive support for old distribution versions.
+# The *SuSE section is a bit convoluted, which deserves a comment.
+# All *SuSE platforms define %%{suse_version) (for now), so it's a good
+# general selector.
+# %%{sle_version} is available starting with SLE* 15.0 and OpenSuSE Leap 42.1.
+# Crucially, if it's not defined, it's certainly not a platform we're
+# interested in (unless they eventually drop the %%{sle_version} macro again
+# at a later point in time, but we'd deal with that situation once it arises).
+# This leaves us with OpenSuSE Leap 42.* and both SLE* and OpenSuSE Leap
+# 15.0 - 15.3, which we do not want to support and which can be filtered out
+# via %%{?sle_version}.
+%if ( 0%{?fedora} && 0%{?fedora} < 30 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && ( ! 0%{?sle_version} || ( 0%{?sle_version} < 150400 ) ) )
+%define         support_kdrive 0
+%endif
+
 Name:           x2goserver
 Version:        4.1.0.4
 Release:        0.0x2go1%{?dist}
@@ -128,7 +145,9 @@ Requires:       sshfs
 # For /etc/sudoers.d
 Requires:       sudo
 Requires:       x2goserver-x2goagent = %{version}-%{release}
+%if 0%{?support_kdrive}
 Requires:       x2goserver-x2gokdrive = %{version}-%{release}
+%endif
 Requires(post): grep
 Requires:       grep
 Requires:       perl(File::Which)
@@ -378,6 +397,7 @@ This package is a wrapper that activates X2Go branding in nxagent.
 Please refer to the nxagent package's description for more information
 on NX.
 
+%if 0%{?support_kdrive}
 %package x2gokdrive
 Group:          Applications/System
 Summary:        X2Go Server's X2Go KDrive Xserver
@@ -404,6 +424,7 @@ X2Go KDrive does not require an XServer on the client side, only the
 X11-independent x2gokdriveclient. Desktop session data transfers from
 server to client use differential image compression and image data gets
 cached client-side.
+%endif
 
 %package printing
 Summary:        X2Go Server (printing support)
@@ -1090,6 +1111,7 @@ fi
 %config(noreplace) %{_sysconfdir}/x2go/keystrokes.cfg
 
 
+%if 0%{?support_kdrive}
 %files x2gokdrive
 %defattr(-,root,root)
 %doc debian/copyright
@@ -1097,6 +1119,7 @@ fi
 %{_datadir}/x2go/versions/VERSION.x2goserver-x2gokdrive
 %{_datadir}/x2go/x2gofeature.d/x2goserver-x2gokdrive.features
 %config(noreplace) %{_sysconfdir}/x2go/x2gokdrive.options
+%endif
 
 
 %files printing

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git