This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit ee8c1433a52832c5a57274f4a79ed81920e6d700 Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Jan 24 10:57:08 2018 +0100 x2goserver.spec: add new conffile /etc/tmpfiles.d/x2goserver.conf on systems that actually use/have systemd. Cherry-picked from release/4.0.1.x branch. Moved into x2goserver-common package. --- debian/changelog | 2 ++ x2goserver.spec | 9 +++++++++ 2 files changed, 11 insertions(+) diff --git a/debian/changelog b/debian/changelog index 194850a..38e2398 100644 --- a/debian/changelog +++ b/debian/changelog @@ -398,6 +398,8 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium - Install new files x2go{checkport,get{free,random}port,queryconfig} into the lib dir. - 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. -- X2Go Release Manager <git-admin@x2go.org> Sat, 11 Nov 2017 13:01:29 +0100 diff --git a/x2goserver.spec b/x2goserver.spec index d7c7f44..88f9b72 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -624,6 +624,12 @@ EOF rm -f "%{buildroot}/etc/sudoers.d/x2goserver" %endif +# Delete tmpfiles.d configuration file on systems +# not using systemd. +%if ( ! 0%{?fedora} ) && ( ( 0%{?rhel} && 0%{?rhel} < 7 ) || ( 0%{?suse_version} && 0%{?suse_version} < 1210 ) ) +rm -f "%{buildroot}/etc/tmpfiles.d/x2goserver.conf" +%endif + %pre common if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser @@ -892,6 +898,9 @@ fi %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf %config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql %config(noreplace) %{_sysconfdir}/x2go/x2go_logout* +%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210 +%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf +%endif %{_mandir}/man5/x2goserver.conf.5.gz %dir %{_datadir}/x2go/versions %{_datadir}/x2go/versions/VERSION.x2goserver-common -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git