RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6168 from SUSE/wip-13333-infernalis

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

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
This commit is contained in:
Ken Dreyer 2015-10-02 13:30:37 -06:00
commit 3139ab4de0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ceph.spec.in
View File

@ -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