From: Nathan Cutler <ncutler@suse.com>
Date: Thu, 26 Nov 2015 14:22:21 +0000 (+0100)
Subject: ceph.spec.in: use %tmpfiles_create macro
X-Git-Tag: v10.0.2~25^2^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=014e2f0e7639b41d2722eb07996289ded140d559;p=ceph.git

ceph.spec.in: use %tmpfiles_create macro

Ensure the macro is defined, and use it to placate the relevant openSUSE
RPMLINT check.

Drop --prefix=/run/ceph (introduced by 477bb064) because we now supply the
configuration file on the systemd-tmpfiles command line. (We don't need to run
systemd-tmpfiles on all files in /usr/lib/tmpfiles.d/ - just on ours.)

Signed-off-by: Nathan Cutler <ncutler@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 09e63fc290b1..a9a8143d774e 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -43,6 +43,7 @@ restorecon -R /var/log/ceph > /dev/null 2>&1;
 # /var/run/ceph.
 %if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
 %global _with_systemd 1
+%{!?tmpfiles_create: %global tmpfiles_create systemd-tmpfiles --create}
 %endif
 
 # LTTng-UST enabled on Fedora, RHEL 6, and SLES 12
@@ -935,7 +936,7 @@ exit 0
 
 %post -n ceph-common
 %if 0%{?_with_systemd}
-systemd-tmpfiles --create --prefix=/run/ceph
+%tmpfiles_create %{_tmpfilesdir}/ceph-common.conf
 %endif
 
 %postun -n ceph-common