This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 331604e3a23b1a3ecb57225e6535f608cf7ac20f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 12 01:55:23 2018 +0100 x2goserver.spec: create applications file in %install section, not %pre. Cherry-picked from release/4.0.1.x branch. --- debian/changelog | 1 + x2goserver.spec | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 39375cb..316aad3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -408,6 +408,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium Own the file as part of a %ghost procedure and make sure that the removal is only executed on real package erases (i.e., not also during package upgrades). + - Create applications file in %install section, not %pre. * debian/x2goserver.install: - Install new /etc/tmpfiles.d/x2goserver.conf conffile. diff --git a/x2goserver.spec b/x2goserver.spec index f153e9e..47c2883 100644 --- a/x2goserver.spec +++ b/x2goserver.spec @@ -630,6 +630,11 @@ rm -f "%{buildroot}/etc/sudoers.d/x2goserver" rm -f "%{buildroot}/etc/tmpfiles.d/x2goserver.conf" %endif +# Dummy file - will be created/removed in post* scriptlets. +# We just need this here for the %ghost directory to work. +touch "%{buildroot}/%{_sysconfdir}/x2go/applications" + + %pre common if ! getent group x2gouser 1>/dev/null; then groupadd -r x2gouser @@ -639,9 +644,6 @@ if ! getent passwd x2gouser 1>/dev/null; then -c "x2go" x2gouser fi -# Dummy file - will be created/removed in post* scriptlets. -# We just need this here for the %ghost directory to work. -touch "%{buildroot}/%{_sysconfdir}/x2go/applications" %post # Initialize the session database -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git