- release 2 (by relup.sh)

[packages/ceph.git] / ceph.spec

diff --git a/ceph.spec b/ceph.spec
index 1bd261be4f76dff791e7268e798b2c8f40a3a4f2..8d1457045ee2740d35d3a37a5a2a64b402f863f5 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,17 +1,17 @@
 #
 # Conditional build:
 %bcond_without java    # Java binding
-%bcond_with    zfs     # ZFS support [needs zfs.pc, not provided yet(?)]
+%bcond_with    zfs     # ZFS support
 #
 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.79
-Release:       1
+Version:       0.82
+Release:       2
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 0ef1af692a1b64c3875899f4f20b2a70
+# Source0-md5: 26cc762f36786ab601705a9d3a30e16e
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
 URL:           http://ceph.com/
@@ -30,6 +30,7 @@ BuildRequires:        keyutils-devel
 BuildRequires: leveldb-devel
 BuildRequires: libaio-devel
 BuildRequires: libatomic_ops
+BuildRequires: libblkid-devel
 BuildRequires: libedit-devel >= 2.11
 BuildRequires: libfuse-devel
 BuildRequires: libltdl-devel
@@ -189,6 +190,7 @@ Agenci OCF do monitorowania procesów Cepha.
 # using included one which fails with Sun/Oracle JDK 1.6
 %configure \
        %{?with_java:JAVAC=/usr/bin/javac} \
+       %{?with_zfs:LIBZFS_CFLAGS="-I/usr/include/libzfs -I/usr/include/libspl"} \
        ac_cv_prog_uudecode_base64=no \
        --sbindir=/sbin \
        --with-cryptopp \
@@ -272,6 +274,7 @@ fi
 %attr(755,root,root) %{_bindir}/ceph_filestore_tool
 %attr(755,root,root) %{_bindir}/ceph_mon_store_converter
 %attr(755,root,root) %{_bindir}/cephfs
+%attr(755,root,root) %{_bindir}/cephfs-journal-tool
 %attr(755,root,root) %{_bindir}/crushtool
 %attr(755,root,root) %{_bindir}/librados-config
 %attr(755,root,root) %{_bindir}/monmaptool
@@ -284,7 +287,6 @@ fi
 %attr(755,root,root) /sbin/ceph-disk-activate
 %attr(755,root,root) /sbin/ceph-disk-prepare
 %attr(755,root,root) /sbin/ceph-disk-udev
-%attr(755,root,root) /sbin/mkcephfs
 %attr(755,root,root) /sbin/mount.ceph
 %attr(755,root,root) /sbin/mount.fuse.ceph
 %dir %{_libdir}/ceph
@@ -336,7 +338,6 @@ fi
 %{_mandir}/man8/cephfs.8*
 %{_mandir}/man8/crushtool.8*
 %{_mandir}/man8/librados-config.8*
-%{_mandir}/man8/mkcephfs.8*
 %{_mandir}/man8/monmaptool.8*
 %{_mandir}/man8/mount.ceph.8*
 %{_mandir}/man8/osdmaptool.8*