From: Nathan Cutler <ncutler@suse.com>
Date: Tue, 29 Sep 2015 21:28:00 +0000 (+0200)
Subject: ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE
X-Git-Tag: v9.1.0~37^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=929e5d04a0a65360ad81647f8655ca5ba51fdbac;p=ceph.git

ceph.spec.in: correctly declare systemd dependency for SLE/openSUSE

Signed-off-by: Nathan Cutler <ncutler@suse.com>
(cherry picked from commit 7b1882f87509092380d11ec68b504a7bc1f77830)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 47f4e09a6e3e1..0930c6adf4914 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -35,7 +35,7 @@ restorecon -R /var/log/ceph > /dev/null 2>&1;
 # the _with_systemd variable only implies that we'll install
 # /etc/tmpfiles.d/ceph.conf in order to set up the socket directory in
 # /var/run/ceph.
-%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} > 1300
+%if 0%{?fedora} || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
 %global _with_systemd 1
 %endif
 
@@ -82,10 +82,6 @@ Requires:	cryptsetup
 Requires:	findutils
 Requires:	which
 Requires(post):	binutils
-# We require this to be present for %%{_tmpfilesdir}
-%if 0%{?_with_systemd}
-Requires: systemd
-%endif
 %if 0%{with cephfs_java}
 BuildRequires: sharutils
 %endif
@@ -135,6 +131,10 @@ BuildRequires:	yasm
 # distro-conditional dependencies
 #################################################################################
 %if 0%{?suse_version}
+%if 0%{?_with_systemd}
+BuildRequires:	systemd-rpm-macros
+%{?systemd_requires}
+%endif
 Requires:	python-Flask
 BuildRequires:	net-tools
 BuildRequires:	libbz2-devel
@@ -152,6 +152,9 @@ BuildRequires:	mozilla-nss-devel
 BuildRequires:	keyutils-devel
 BuildRequires:	libatomic-ops-devel
 %else
+%if 0%{?_with_systemd}
+Requires:	systemd
+%endif
 BuildRequires:  bzip2-devel
 BuildRequires:	nss-devel
 BuildRequires:	keyutils-libs-devel