[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: Xresources symlink stays in /etc/x2go for now, no need to use %{_distconfdir} or the like.

[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 60a406af0dc40bc21e2784f87baf85bf68a2a81b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 27 22:58:34 2023 +0100

    x2goserver.spec: Xresources symlink stays in /etc/x2go for now, no need to use %{_distconfdir} or the like.
---
 debian/changelog | 2 ++
 x2goserver.spec  | 5 -----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 911544ff..06d89762 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -428,6 +428,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       /usr/lib/os-release and /etc/os-release and generally refine checking
       layout a bit.
     - x2goserver-xsession/Makefile: Xresources is a file, not a directory.
+    - x2goserver.spec: Xresources symlink stays in /etc/x2go for now, no need
+      to use %{_distconfdir} or the like.
   * 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 f17f89bf..09374814 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1107,12 +1107,7 @@ 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