From: Loic Dachary <loic@dachary.org>
Date: Thu, 2 Apr 2015 09:32:09 +0000 (+0200)
Subject: Merge pull request #4068 from dachary/wip-opensuse
X-Git-Tag: v9.0.0~54
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e33951342daede8ae79b3425423faecb3d0a4459;p=ceph.git

Merge pull request #4068 from dachary/wip-opensuse

tests: add OpenSUSE 13.2 dockerfile

Reviewed-by: Owen Synge <osynge@suse.com>
---

e33951342daede8ae79b3425423faecb3d0a4459
diff --cc ceph.spec.in
index 1d9b8ba350f,0552bc2dec8..0dc561fad95
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -46,13 -37,11 +46,15 @@@ Requires:	util-linu
  Requires:	hdparm
  Requires:	cryptsetup
  Requires(post):	binutils
 +# We require this to be present for %%{_tmpfilesdir}
 +%if 0%{?_with_systemd}
 +Requires: systemd
 +%endif
  BuildRequires:	gcc-c++
  BuildRequires:	boost-devel
+ %if ! 0%{defined suse_version}
  BuildRequires:  bzip2-devel
+ %endif
  BuildRequires:	cryptsetup
  BuildRequires:	gdbm
  BuildRequires:	hdparm