[X2Go-Commits] [x2goserver] 04/05: x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink.

[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 0ffcf4efb7be89b7ea0d4baac2ec3cb0f2290032
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 27 21:51:43 2023 +0100

    x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for Xresources symlink.
---
 debian/changelog | 2 ++
 x2goserver.spec  | 5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 5d7d9abf..ac55391a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -422,6 +422,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       see whether symlinks or a directory has been added.
     - x2goserver-xsession/Makefile: support Tumbleweed with Xresources in
       /usr/etc.
+    - x2goserver.spec: support UsrEtc(Move) for OpenSuSE Tumbleweed for
+      Xresources symlink.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
     + Pull in base64 as a run-time dependency. We'll need it in scripts.
diff --git a/x2goserver.spec b/x2goserver.spec
index 09374814..f17f89bf 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1107,7 +1107,12 @@ fi
 %if 0%{?fedora} || 0%{?rhel}
 %{_sysconfdir}/x2go/Xclients.d
 %endif
+# Support UsrEtc(Move) on *SuSE.
+%if 0%{?suse_version} >= 1500
+usr%{_sysconfdir}/x2go/Xresources
+%else
 %{_sysconfdir}/x2go/Xresources
+%endif
 %config(noreplace) %{_sysconfdir}/x2go/Xsession
 %{_datadir}/x2go/x2gofeature.d/x2goserver-xsession.features
 %{_datadir}/x2go/versions/VERSION.x2goserver-xsession

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