From: Ken Dreyer <kdreyer@redhat.com>
Date: Wed, 24 Jun 2015 20:04:13 +0000 (-0600)
Subject: Merge pull request #4981 from ceph/wip-fedora-build-fixes
X-Git-Tag: v9.0.3~123
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b5e5778b205429dc181ef9c4eb6aa406715055cb;p=ceph.git

Merge pull request #4981 from ceph/wip-fedora-build-fixes

Fix various issues with fedora (f21+) builds

Reviewed-by: Ken Dreyer <kdreyer@redhat.com>
---

b5e5778b205429dc181ef9c4eb6aa406715055cb
diff --cc ceph.spec.in
index d239eea18a93,434e6e28b2de..e94d930850f0
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@@ -54,10 -54,8 +54,11 @@@ Requires(post):	binutil
  %if 0%{?_with_systemd}
  Requires: systemd
  %endif
 +%if 0%{with cephfs_java}
 +BuildRequires: sharutils
 +%endif
  BuildRequires:	gcc-c++
+ BuildRequires:	git
  BuildRequires:	boost-devel
  BuildRequires:	cryptsetup
  BuildRequires:	gdbm