[X2Go-Commits] [x2goserver] 04/04: x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d.
git-admin at x2go.org
git-admin at x2go.org
Thu Feb 22 00:56:13 CET 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch release/4.0.1.x
in repository x2goserver.
commit da74ae701e7c14e12f968c04a0ccbffca4a0590f
Author: Mihai Moldovan <ionic at ionic.de>
Date: Wed Feb 21 22:09:39 2018 +0100
x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d.
---
debian/changelog | 1 +
x2goserver.spec | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1ddd3eb..62c78cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -108,6 +108,7 @@ x2goserver (4.0.1.23-0x2go1) UNRELEASED; urgency=medium
removal is only executed on real package erases (i.e., not also during
package upgrades).
- Create applications file in %install section, not %pre.
+ - Move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d.
* debian/x2goserver.install:
- Install new /etc/tmpfiles.d/x2goserver.conf conffile.
- Move etc/tmpfiles.d entry to usr/lib/tmpfiles.d.
diff --git a/x2goserver.spec b/x2goserver.spec
index 5141aec..f029da2 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -479,7 +479,7 @@ rm -f "%{buildroot}/etc/sudoers.d/x2goserver"
# 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"
+rm -f "%{buildroot}/%{_prefix}/lib/tmpfiles.d/x2goserver.conf"
%endif
# Dummy file - will be created/removed in post* scriptlets.
@@ -663,7 +663,7 @@ fi
%config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf
%config(noreplace) %{_sysconfdir}/x2go/x2gosql/
%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf
+%{_prefix}/lib/tmpfiles.d/x2goserver.conf
%endif
%{_bindir}/x2go*
%exclude %{_bindir}/x2goserver-run-extensions
--
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