[X2Go-Commits] [x2goserver] 01/01: x2goserver.spec: backport /etc/x2g/applications behavior from upstream Fedora spec file.
git-admin at x2go.org
git-admin at x2go.org
Mon Feb 12 00:27:05 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 b8c9156b8736a8c6bb704fefd8104320b4e5ef2a
Author: Mihai Moldovan <ionic at ionic.de>
Date: Mon Feb 12 00:05:42 2018 +0100
x2goserver.spec: backport /etc/x2g/applications behavior from upstream Fedora spec file.
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).
Cherry-picked from release/4.0.1.x branch.
---
debian/changelog | 4 ++++
x2goserver.spec | 14 +++++++++++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 99fa78c..39375cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -404,6 +404,10 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
use/have systemd.
- Actually install /etc/sudoers.d/x2goserver conffile on non-SuSE systems.
Got broken accidentally a while ago.
+ - Backport /etc/x2g/applications behavior from upstream Fedora spec file.
+ 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).
* debian/x2goserver.install:
- Install new /etc/tmpfiles.d/x2goserver.conf conffile.
diff --git a/x2goserver.spec b/x2goserver.spec
index 7a34956..f153e9e 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -639,6 +639,10 @@ 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
if [ ! -s %{_localstatedir}/lib/x2go/x2go_sessions ]; then
@@ -672,8 +676,10 @@ fi
%endif
%preun
-if [ -L %{_sysconfdir}/x2go/applications ]; then
- rm -f %{_sysconfdir}/x2go/applications || :
+if [ "${1}" = "0" ]; then
+ if [ -L %{_sysconfdir}/x2go/applications ]; then
+ rm -f %{_sysconfdir}/x2go/applications || :
+ fi
fi
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
@@ -895,9 +901,11 @@ fi
%dir %{_sysconfdir}/x2go/
%dir %{_sysconfdir}/x2go/x2gosql
%dir %{_sysconfdir}/x2go/x2gosql/passwords
+%ghost %config(noreplace) %{_sysconfdir}/x2go/applications
+%config(noreplace) %{_sysconfdir}/x2go/x2go_logout
+%config(noreplace) %{_sysconfdir}/x2go/x2go_logout.d/
%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
--
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