[X2Go-Commits] [x2goserver] 05/07: x2goserver.spec: fix logic when checking for "distro version lower than X".

git-admin at x2go.org git-admin at x2go.org
Wed Jan 24 11:57:41 CET 2018


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

x2go pushed a commit to branch master
in repository x2goserver.

commit cd3655568ded41f82ca71e92c0f7be696d5c185b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 24 10:52:12 2018 +0100

    x2goserver.spec: fix logic when checking for "distro version lower than X".
---
 debian/changelog | 1 +
 x2goserver.spec  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c7d88c..194850a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -397,6 +397,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
     - Add correct Group: to x2goserver-logcheck package.
     - Install new files x2go{checkport,get{free,random}port,queryconfig} into
       the lib dir.
+    - Fix logic when checking for "distro version lower than X".
 
  -- X2Go Release Manager <git-admin at x2go.org>  Sat, 11 Nov 2017 13:01:29 +0100
 
diff --git a/x2goserver.spec b/x2goserver.spec
index c0c4f3b..d7c7f44 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -620,7 +620,7 @@ EOF
 # We move the file to the doc dir, add a README.sudo
 # and also references this in our wiki on
 # https://wiki.x2go.org/doku.php/doc:installation:x2goserver#workaround_for_qt-based_applications_and_sudo_kdesu
-%if 0%{?suse_version} < 1210
+%if 0%{?suse_version} && 0%{?suse_version} < 1210
 rm -f "%{buildroot}/etc/sudoers.d/x2goserver"
 %endif
 
@@ -780,7 +780,7 @@ fi
 %doc debian/copyright
 %doc debian/changelog
 # Workaround for sudoers on OpenSUSE 11/SLE{S,D} 11.
-%if 0%{?suse_version} < 1210
+%if 0%{?suse_version} && 0%{?suse_version} < 1210
 %doc x2goserver/doc/README.sudoers
 %doc x2goserver/etc/sudoers.d/x2goserver
 %endif
@@ -969,7 +969,7 @@ fi
 %doc debian/changelog
 # logcheck is not available on OpenSUSE, SLES/SLED, FC19 and RHEL.
 # Please re-check this periodically.
-%if 0%{?suse_version} || 0%{?fedora} < 20 || 0%{?rhel}
+%if 0%{?suse_version} || ( 0%{?fedora} && 0%{?fedora} < 20 ) || 0%{?rhel}
 %dir %{_sysconfdir}/logcheck
 %dir %{_sysconfdir}/logcheck/ignore.d.server
 %endif

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


More information about the x2go-commits mailing list