- release 2 (by relup.sh)

[packages/ceph.git] / ceph.spec

diff --git a/ceph.spec b/ceph.spec
index 1c329653c1fc42efe0aace596fb8af4b9bc4655a..f1352b6fbda5151f377c9ff9316c1eb97e7e9654 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,5 +1,4 @@
 # TODO:
-#      - accelio libxio (BR: accelio libibverbs-devel librdmacm-devel
 #      - proper init scripts if non-systemd boot is too be supported
 #         (upstream scripts seem overcomplicated and hardly useful)
 #      - run as non-root user
@@ -7,6 +6,7 @@
 #
 # Conditional build:
 %bcond_without java            # Java binding
+%bcond_with    accelio         # Accelio transport support
 %bcond_with    kinetic         # Kinetic storage support [needs update for internal API changes]
 %bcond_with    rocksdb         # RocksDB storage support [needs update for internal API changes]
 %bcond_with    zfs             # ZFS support
@@ -21,12 +21,12 @@
 Summary:       User space components of the Ceph file system
 Summary(pl.UTF-8):     Działające w przestrzeni użytkownika elementy systemu plików Ceph
 Name:          ceph
-Version:       0.94.2
+Version:       0.94.3
 Release:       2
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 249648d35e634adaaeec727408ca6092
+# Source0-md5: ccbaba6cad56cf71719661a0cdcc6ad6
 Source1:       ceph.sysconfig
 # based on files from https://github.com/ceph/ceph/tree/master/systemd
 Source10:      cephctl
@@ -39,8 +39,8 @@ Patch0:               %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
 Patch2:                %{name}-link.patch
 Patch3:                %{name}-ac.patch
-Patch4:                %{name}-boost.patch
 URL:           http://ceph.com/
+%{?with_accelio:BuildRequires: accelio-devel}
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 %{?with_babeltrace:BuildRequires:      babeltrace-devel}
@@ -60,7 +60,9 @@ BuildRequires:        libatomic_ops
 BuildRequires: libblkid-devel >= 2.17
 BuildRequires: libedit-devel >= 2.11
 BuildRequires: libfuse-devel
+%{?with_accelio:BuildRequires: libibverbs-devel}
 BuildRequires: libltdl-devel
+%{?with_accelio:BuildRequires: librdmacm-devel}
 BuildRequires: libs3-devel
 BuildRequires: libstdc++-devel
 %{?with_tcmalloc:BuildRequires:        libtcmalloc-devel}
@@ -214,7 +216,6 @@ Agenci OCF do monitorowania procesów Cepha.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 
 %build
 %{__libtoolize}
@@ -242,7 +243,8 @@ Agenci OCF do monitorowania procesów Cepha.
        --with-system-leveldb \
        --with-system-libs3 \
        %{?with_java:--enable-cephfs-java --with-jdk-dir=%{_jvmdir}/java} \
-       --disable-silent-rules
+       --disable-silent-rules \
+       %{?with_accelio:--enable-xio}
 
 %{__make} -j1
 
@@ -407,6 +409,7 @@ fi
 %{_mandir}/man8/ceph-authtool.8*
 %{_mandir}/man8/ceph-clsinfo.8*
 %{_mandir}/man8/ceph-conf.8*
+%{_mandir}/man8/ceph-create-keys.8*
 %{_mandir}/man8/ceph-debugpack.8*
 %{_mandir}/man8/ceph-dencoder.8*
 %{_mandir}/man8/ceph-deploy.8*