[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: don't disable KDrive on OpenSuSE Tumbleweed, check if %{suse_version} is lower than 1600 (which would also match ALP, but we currently don't care about this).

[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 8bedb925327bd3c363be6e4d30153fde2347ec20
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Tue Jul 4 02:57:40 2023 +0200

    x2goserver.spec: don't disable KDrive on OpenSuSE Tumbleweed, check if %{suse_version} is lower than 1600 (which would also match ALP, but we currently don't care about this).
---
 debian/changelog | 4 ++++
 x2goserver.spec  | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ffcfb9a..c9886b00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,10 @@ x2goserver (4.1.0.6-0x2go1) UNRELEASED; urgency=medium
       empty string based upon the Debian (>= 9/stretch) or Ubuntu version (>=
       20.04/focal).
     + Use single quotes to prevent the shell from interpreting variables.
+  * x2goserver.spec:
+    + Don't disable KDrive on OpenSuSE Tumbleweed, check if %{suse_version} is
+      lower than 1600 (which would also match ALP, but we currently don't care
+      about this).
 
  -- X2Go Release Manager <git-admin at x2go.org>  Tue, 06 Jun 2023 19:32:34 +0200
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 83a8f82e..247b3942 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -5,13 +5,16 @@
 # 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
+# Crucially, if it's not defined, it's (almost) 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 ) ) )
+# And then, there is Tumbleweed. Since SLE is not a direct ancestor, it also
+# doesn't have %%{sle_version}, but we can filter it out by checking for a
+# high-enough %%{suse_version} macro.
+%if ( 0%{?fedora} && 0%{?fedora} < 30 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1600 && ( ! 0%{?sle_version} || ( 0%{?sle_version} < 150400 ) ) )
 %define         support_kdrive 0
 %endif
 

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