]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #4068 from dachary/wip-opensuse
authorLoic Dachary <loic@dachary.org>
Thu, 2 Apr 2015 09:32:09 +0000 (11:32 +0200)
committerLoic Dachary <loic@dachary.org>
Thu, 2 Apr 2015 09:32:09 +0000 (11:32 +0200)
tests: add OpenSUSE 13.2 dockerfile

Reviewed-by: Owen Synge <osynge@suse.com>
1  2 
ceph.spec.in
src/test/Makefile.am

diff --cc ceph.spec.in
index 1d9b8ba350fdc5f971ccd8335146e9e67095d375,0552bc2dec8d8186fc57c0b53ce0fdb7aca87310..0dc561fad959165f2a8534bf19623bb65c9a3dd6
@@@ -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
Simple merge