]> git.pld-linux.org Git - packages/ceph.git/blobdiff - ceph.spec
- updated to 0.72
[packages/ceph.git] / ceph.spec
index 06277a22c3259464db738f08c9aa7822fcd55b63..a47480e3203a578d412bdd409d7f91cd070c3dc6 100644 (file)
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,20 +1,19 @@
 #
 # Conditional build:
-%bcond_with    hadoop  # Hadoop client (requires JNI)
 %bcond_without java    # Java binding
+%bcond_with    zfs     # ZFS support [needs zfs.pc, not provided yet(?)]
 #
 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.56.1
+Version:       0.72
 Release:       1
 License:       LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:         Base
 Source0:       http://ceph.newdream.net/download/%{name}-%{version}.tar.bz2
-# Source0-md5: 040ba7a10e7545ad6c5a7b26927c1c57
+# Source0-md5: 468fba156cbb6163945fe438c8f9870d
 Patch0:                %{name}-init-fix.patch
 Patch1:                %{name}.logrotate.patch
-Patch2:                %{name}-link.patch
 URL:           http://ceph.newdream.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -24,7 +23,7 @@ BuildRequires:        curl-devel
 BuildRequires: expat-devel >= 1.95
 BuildRequires: fcgi-devel
 BuildRequires: gdbm-devel
-%if %{with java} || %{with hadoop}
+%if %{with java}
 BuildRequires: jdk
 %endif
 BuildRequires: keyutils-devel
@@ -44,13 +43,18 @@ BuildRequires:      pkgconfig
 BuildRequires: python >= 1:2.4
 BuildRequires: rpmbuild(macros) >= 1.228
 BuildRequires: snappy-devel
+%ifarch %{x8664}
+BuildRequires: yasm
+%endif
+%{?with_zfs:BuildRequires:     zfs-devel}
 Requires(post,preun):  /sbin/chkconfig
 Requires(preun):       rc-scripts
 Requires:      %{name}-libs = %{version}-%{release}
 Obsoletes:     gcephtool
+Obsoletes:     hadoop-cephfs
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define                skip_post_check_so      libcls_.*.so.*
+%define                skip_post_check_so      libcls_.*.so.* libec_.*.so.*
 
 %description
 Ceph is a distributed network file system designed to provide
@@ -169,36 +173,25 @@ OCF Resource Agents for Ceph processes.
 %description resource-agents -l pl.UTF-8
 Agenci OCF do monitorowania procesów Cepha.
 
-%package -n hadoop-cephfs
-Summary:       Hadoop client for Ceph filesystem
-Summary(pl.UTF-8):     Klient Hadoopa dla systemu plików Ceph
-Group:         Libraries
-Requires:      %{name} = %{version}-%{release}
-Requires:      hadoop
-
-%description -n hadoop-cephfs
-Hadoop client for Ceph filesystem.
-
-%description -n hadoop-cephfs -l pl.UTF-8
-Klient Hadoopa dla systemu plików Ceph.
-
 %prep
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 %build
 %{__libtoolize}
-%{__aclocal}
+%{__aclocal} -I m4
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%{?with_hadoop:CPPFLAGS="%{rpmcppflags} -I%{_jvmdir}/java/include -I%{_jvmdir}/java/include/linux"}
+# ac_cv_prog_uudecode_base64=no is a hack to compile Test.class instead of
+# using included one which fails with Sun/Oracle JDK 1.6
 %configure \
+       %{?with_java:JAVAC=/usr/bin/javac} \
+       ac_cv_prog_uudecode_base64=no \
        --sbindir=/sbin \
        --with-cryptopp \
-       --with-hadoop%{!?with_hadoop:=no} \
+       %{?with_zfs:--with-libzfs} \
        --with-ocf \
        --with-radosgw \
        --with-system-leveldb \
@@ -221,10 +214,7 @@ 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}/rados-classes/*.{a,la}
-%if %{with hadoop}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhadoopcephfs.{la,a}
-%endif
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/{erasure-code,rados-classes}/*.{a,la}
 %if %{with java}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libcephfs_jni.{la,a}
 %endif
@@ -253,9 +243,6 @@ fi
 %post  -n java-cephfs -p /sbin/ldconfig
 %postun        -n java-cephfs -p /sbin/ldconfig
 
-%post  -n hadoop-cephfs -p /sbin/ldconfig
-%postun        -n hadoop-cephfs -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 # COPYING specifies licenses of individual parts
@@ -263,39 +250,59 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/ceph
 %dir %{_sysconfdir}/ceph
 %attr(755,root,root) %{_bindir}/ceph
-%attr(755,root,root) %{_bindir}/cephfs
-%attr(755,root,root) %{_bindir}/ceph-conf
+%attr(755,root,root) %{_bindir}/ceph-authtool
 %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-debugpack
 %attr(755,root,root) %{_bindir}/ceph-dencoder
-%attr(755,root,root) %{_bindir}/crushtool
-%attr(755,root,root) %{_bindir}/monmaptool
-%attr(755,root,root) %{_bindir}/osdmaptool
-%attr(755,root,root) %{_bindir}/ceph-authtool
-%attr(755,root,root) %{_bindir}/ceph-syn
-%attr(755,root,root) %{_bindir}/ceph-run
-%attr(755,root,root) %{_bindir}/ceph-mon
 %attr(755,root,root) %{_bindir}/ceph-mds
+%attr(755,root,root) %{_bindir}/ceph-mon
 %attr(755,root,root) %{_bindir}/ceph-osd
+%attr(755,root,root) %{_bindir}/ceph-post-file
 %attr(755,root,root) %{_bindir}/ceph-rbdnamer
+%attr(755,root,root) %{_bindir}/ceph-rest-api
+%attr(755,root,root) %{_bindir}/ceph-run
+%attr(755,root,root) %{_bindir}/ceph-syn
+%attr(755,root,root) %{_bindir}/ceph_filestore_dump
+%attr(755,root,root) %{_bindir}/ceph_mon_store_converter
+%attr(755,root,root) %{_bindir}/cephfs
+%attr(755,root,root) %{_bindir}/crushtool
 %attr(755,root,root) %{_bindir}/librados-config
+%attr(755,root,root) %{_bindir}/monmaptool
+%attr(755,root,root) %{_bindir}/osdmaptool
 %attr(755,root,root) %{_bindir}/rados
 %attr(755,root,root) %{_bindir}/rbd
-%attr(755,root,root) %{_bindir}/ceph-debugpack
-%attr(755,root,root) %{_bindir}/ceph-coverage
+%attr(755,root,root) %{_bindir}/rbd-fuse
 %attr(755,root,root) /sbin/ceph-create-keys
+%attr(755,root,root) /sbin/ceph-disk
 %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}/rados-classes
+%attr(755,root,root) %{_libdir}/rados-classes/libcls_hello.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_kvs.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_lock.so*
+%attr(755,root,root) %{_libdir}/rados-classes/libcls_log.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_rbd.so*
 %attr(755,root,root) %{_libdir}/rados-classes/libcls_refcount.so*
+%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_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
 %config(noreplace) %{_sysconfdir}/bash_completion.d/ceph
@@ -309,7 +316,9 @@ fi
 %{_mandir}/man8/ceph-mds.8*
 %{_mandir}/man8/ceph-mon.8*
 %{_mandir}/man8/ceph-osd.8*
+%{_mandir}/man8/ceph-post-file.8*
 %{_mandir}/man8/ceph-rbdnamer.8*
+%{_mandir}/man8/ceph-rest-api.8*
 %{_mandir}/man8/ceph-run.8*
 %{_mandir}/man8/ceph-syn.8*
 %{_mandir}/man8/cephfs.8*
@@ -323,6 +332,7 @@ fi
 %{_mandir}/man8/radosgw.8*
 %{_mandir}/man8/radosgw-admin.8*
 %{_mandir}/man8/rbd.8*
+%{_mandir}/man8/rbd-fuse.8*
 
 %dir %{_localstatedir}/lib/ceph
 %dir %{_localstatedir}/lib/ceph/tmp
@@ -357,6 +367,9 @@ fi
 
 %files -n python-ceph
 %defattr(644,root,root,755)
+%{py_sitescriptdir}/ceph_argparse.py[co]
+%{py_sitescriptdir}/ceph_rest_api.py[co]
+%{py_sitescriptdir}/cephfs.py[co]
 %{py_sitescriptdir}/rados.py[co]
 %{py_sitescriptdir}/rbd.py[co]
 
@@ -388,11 +401,3 @@ fi
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/ceph/mon
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/ceph/osd
 %attr(755,root,root) %{_prefix}/lib/ocf/resource.d/ceph/rbd
-
-%if %{with hadoop}
-%files -n hadoop-cephfs
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libhadoopcephfs.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libhadoopcephfs.so.1
-%attr(755,root,root) %{_libdir}/libhadoopcephfs.so
-%endif
This page took 0.062388 seconds and 4 git commands to generate.