- release 2 (by relup.sh)

[packages/ceph.git] / ceph.spec

diff --git a/ceph.spec b/ceph.spec
index 8ff83d6fd42481fbe4095fda8f9b3370a98d544b..8d1457045ee2740d35d3a37a5a2a64b402f863f5 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,20 +1,20 @@
 #
 # 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.72.1
-Release:       1
+Version:       0.82
+Release:       2
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
-Source0:       http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: d9dd5f7e03731368b87bed584778f496
+Source0:       http://ceph.com/download/%{name}-%{version}.tar.bz2
+# Source0-md5: 26cc762f36786ab601705a9d3a30e16e
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
-URL:           http://ceph.newdream.net/
+URL:           http://ceph.com/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: boost-devel >= 1.34
@@ -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
@@ -43,6 +44,7 @@ BuildRequires:        pkgconfig
 BuildRequires: python >= 1:2.4
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: snappy-devel
+BuildRequires: xfsprogs-devel
 %ifarch %{x8664}
 BuildRequires: yasm
 %endif
@@ -188,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 \
@@ -214,7 +217,8 @@ install -p src/init-ceph $RPM_BUILD_ROOT/etc/rc.d/init.d/ceph
 install -p src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
 
 # loadable modules
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/{erasure-code,rados-classes}/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/ceph/erasure-code/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/rados-classes/*.{a,la}
 %if %{with java}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libcephfs_jni.{la,a}
 %endif
@@ -251,9 +255,11 @@ fi
 %dir %{_sysconfdir}/ceph
 %attr(755,root,root) %{_bindir}/ceph
 %attr(755,root,root) %{_bindir}/ceph-authtool
+%attr(755,root,root) %{_bindir}/ceph-brag
 %attr(755,root,root) %{_bindir}/ceph-clsinfo
 %attr(755,root,root) %{_bindir}/ceph-conf
 %attr(755,root,root) %{_bindir}/ceph-coverage
+%attr(755,root,root) %{_bindir}/ceph-crush-location
 %attr(755,root,root) %{_bindir}/ceph-debugpack
 %attr(755,root,root) %{_bindir}/ceph-dencoder
 %attr(755,root,root) %{_bindir}/ceph-mds
@@ -268,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
@@ -280,16 +287,23 @@ 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}/erasure-code
-%attr(755,root,root) %{_libdir}/erasure-code/libec_example.so*
-%attr(755,root,root) %{_libdir}/erasure-code/libec_fail_to_initialize.so*
-%attr(755,root,root) %{_libdir}/erasure-code/libec_fail_to_register.so*
-%attr(755,root,root) %{_libdir}/erasure-code/libec_hangs.so*
-%attr(755,root,root) %{_libdir}/erasure-code/libec_jerasure.so*
-%attr(755,root,root) %{_libdir}/erasure-code/libec_missing_entry_point.so*
+%dir %{_libdir}/ceph
+%{_libdir}/ceph/ceph_common.sh
+%dir %{_libdir}/ceph/erasure-code
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_example.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_fail_to_initialize.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_fail_to_register.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_hangs.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_jerasure.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_jerasure_generic.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_jerasure_sse3.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_jerasure_sse4.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_missing_entry_point.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_test_jerasure_generic.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_test_jerasure_sse3.so*
+%attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_test_jerasure_sse4.so*
 %dir %{_libdir}/rados-classes
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_hello.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_kvs.so*
@@ -300,9 +314,8 @@ fi
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_replica_log.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_rgw.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_statelog.so*
+%attr(755,root,root) %{_libdir}/rados-classes/libcls_user.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_version.so*
-%dir %{_libdir}/ceph
-%attr(755,root,root) %{_libdir}/ceph/ceph_common.sh
 %{_datadir}/ceph
 %config(noreplace) /etc/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/bash_completion.d/rados
@@ -325,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*