[X2Go-Commits] [x2goserver] 05/06: x2goserver.spec: move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d.

[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 767dbfc308e09b32062ac64bf1ca9046a9c83622
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 5062011..3f3c505 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -74,6 +74,7 @@ x2goserver (4.1.0.1-0x2go1) UNRELEASED; urgency=medium
     + Bump nxagent requirement to 3.5.99.5+.
     + Remove stale symlinks check workaround now that we pull in nxagent >=
       3.5.99.0 by default.
+    + Move references from etc/tmpfiles.d to %{_prefix}/lib/tmpfiles.d.
   * debian/copyright.in:
     + Remove reference to rgb file.
     + Remove reference to x2goagent wrapper script.
diff --git a/x2goserver.spec b/x2goserver.spec
index 595ba15..bf09179 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -623,7 +623,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.
@@ -905,7 +905,7 @@ fi
 %config(noreplace) %{_sysconfdir}/x2go/x2goserver.conf
 %config(noreplace) %{_sysconfdir}/x2go/x2gosql/sql
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/x2goserver.conf
+%{_prefix}/lib/tmpfiles.d/x2goserver.conf
 %endif
 %{_mandir}/man5/x2goserver.conf.5.gz
 %dir %{_datadir}/x2go/versions

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git