[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: actually install /etc/sudoers.d/x2goserver conffile on non-SuSE systems.

git-admin at x2go.org git-admin at x2go.org
Wed Jan 24 12:17:01 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 0c61986b5f19fc2959d5fd336110cff6459d5bcf
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Jan 24 12:14:07 2018 +0100

    x2goserver.spec: actually install /etc/sudoers.d/x2goserver conffile on non-SuSE systems.
    
    Got broken accidentally a while ago.
    
    Cherry-picked from release/4.0.1.x branch.
---
 debian/changelog | 2 ++
 x2goserver.spec  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index e4c2ec4..b1ede28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -400,6 +400,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
     - Fix logic when checking for "distro version lower than X".
     - Add new conffile /etc/tmpfiles.d/x2goserver.conf on systems that actually
       use/have systemd.
+    - Actually install /etc/sudoers.d/x2goserver conffile on non-SuSE systems.
+      Got broken accidentally a while ago.
   * debian/x2goserver.install:
     - Install new /etc/tmpfiles.d/x2goserver.conf conffile.
 
diff --git a/x2goserver.spec b/x2goserver.spec
index 88f9b72..7a34956 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -790,7 +790,7 @@ fi
 %doc x2goserver/doc/README.sudoers
 %doc x2goserver/etc/sudoers.d/x2goserver
 %endif
-%if 0%{?suse_version} >= 1210
+%if ( ! 0%{?suse_version} ) || 0%{?suse_version} >= 1210
 %config(noreplace) %{_sysconfdir}/sudoers.d/x2goserver
 %endif
 %{_bindir}/x2go*

--
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