- fixed included patch

- enabled fcgi,fio,zfs by default

diff --git a/ceph-includes.patch b/ceph-includes.patch
index 1c10a3b82960f7c70bea326ea3eccba8246f7bc7..73534151955e5b53ce2f08480f355ce3af92bb75 100644 (file)
--- a/ceph-includes.patch
+++ b/ceph-includes.patch
@@ -1,5 +1,5 @@
---- ../BUILD/ceph-12.2.13/src/common/bit_str.h.orig    2020-01-30 21:52:36.000000000 +0100
-+++ ../BUILD/ceph-12.2.13/src/common/bit_str.h 2020-05-31 19:08:32.698492649 +0200
+--- ceph-12.2.13/src/common/bit_str.h.orig     2020-01-30 21:52:36.000000000 +0100
++++ ceph-12.2.13/src/common/bit_str.h  2020-05-31 19:08:32.698492649 +0200
 @@ -14,7 +14,9 @@
  #ifndef CEPH_COMMON_BIT_STR_H
  #define CEPH_COMMON_BIT_STR_H

diff --git a/ceph.spec b/ceph.spec
index 6081c51b3e9328b9ab601daaad60a20e92efb151..931498df0ab8a58364b3ed8e2073e12dc22b3469 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -10,12 +10,12 @@
 %bcond_with    accelio         # Accelio transport support [needs update for internal API changes]
 %bcond_with    cryptopp        # use cryptopp instead of NSS crypto/SSL
 %bcond_with    dpdk            # DPDK messaging (requires cryptopp instead of nss)
-%bcond_with    fcgi            # RADOS Gateway FCGI frontend
-%bcond_with    fio             # FIO engines support
+%bcond_without fcgi            # RADOS Gateway FCGI frontend
+%bcond_without fio             # FIO engines support
 %bcond_without pmem            # PMDK (persistent memory) support
 %bcond_with    spdk            # Ceph SPDK support (DPDK based)
 %bcond_without system_rocksdb  # system RocksDB storage support
-%bcond_with    zfs             # ZFS support [not ready for zfs 0.8.x]
+%bcond_without zfs             # ZFS support [not ready for zfs 0.8.x]
 %bcond_without lttng           # LTTng tracing
 %bcond_without babeltrace      # Babeltrace traces support
 %bcond_without tcmalloc        # tcmalloc allocator