X-Git-Url: http://git.pld-linux.org/?p=packages%2Fceph.git;a=blobdiff_plain;f=ceph.spec;h=8d1457045ee2740d35d3a37a5a2a64b402f863f5;hp=be7bd0f60a206beda9667deca51f200e93411bbc;hb=9164948ff42c940edb3589857ad81d029722c7eb;hpb=29b2f8e94864fc92a5c6fe2e45f2040336938702

diff --git a/ceph.spec b/ceph.spec
index be7bd0f..8d14570 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -1,20 +1,20 @@
 #
 # Conditional build:
-%bcond_with	hadoop	# Hadoop client (requires JNI)
+%bcond_without	java	# Java binding
+%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.55.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:	8276e98f2cffe6deabe729716fe930f6
+Source0:	http://ceph.com/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	26cc762f36786ab601705a9d3a30e16e
 Patch0:		%{name}-init-fix.patch
 Patch1:		%{name}.logrotate.patch
-Patch2:		%{name}-link.patch
-URL:		http://ceph.newdream.net/
+URL:		http://ceph.com/
 BuildRequires:	autoconf >= 2.59
 BuildRequires:	automake
 BuildRequires:	boost-devel >= 1.34
@@ -23,11 +23,14 @@ BuildRequires:	curl-devel
 BuildRequires:	expat-devel >= 1.95
 BuildRequires:	fcgi-devel
 BuildRequires:	gdbm-devel
-%{?with_hadoop:BuildRequires:	jdk}
+%if %{with java}
+BuildRequires:	jdk
+%endif
 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
@@ -41,13 +44,19 @@ BuildRequires:	pkgconfig
 BuildRequires:	python >= 1:2.4
 BuildRequires:	rpmbuild(macros) >= 1.228
 BuildRequires:	snappy-devel
+BuildRequires:	xfsprogs-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
@@ -113,6 +122,18 @@ Ceph Python bindings.
 %description -n python-ceph -l pl.UTF-8
 Wiązania Pythona do bibliotek Cepha.
 
+%package -n java-cephfs
+Summary:	CephFS Java bindings
+Summary(pl.UTF-8):	Wiązania Javy do biblioteki CephFS
+Group:		Libraries/Java
+Requires:	%{name}-libs = %{version}-%{release}
+
+%description -n java-cephfs
+CephFS Java bindings.
+
+%description -n java-cephfs -l pl.UTF-8
+Wiązania Javy do biblioteki CephFS.
+
 %package fuse
 Summary:	Ceph FUSE-based client
 Summary(pl.UTF-8):	Klient Cepha oparty na FUSE
@@ -154,40 +175,31 @@ 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} \
+	%{?with_zfs:LIBZFS_CFLAGS="-I/usr/include/libzfs -I/usr/include/libspl"} \
+	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 \
 	--with-system-libs3 \
+	%{?with_java:--enable-cephfs-java --with-jdk-dir=%{_jvmdir}/java} \
 	--disable-silent-rules
 
 %{__make}
@@ -196,17 +208,21 @@ Klient Hadoopa dla systemu plików Ceph.
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_localstatedir}/{lib/ceph/tmp,log/ceph/stat} \
 	$RPM_BUILD_ROOT%{_sysconfdir}/{ceph,bash_completion.d,logrotate.d,rc.d/init.d}
+
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT
+	DESTDIR=$RPM_BUILD_ROOT \
+	javadir=%{_javadir}
 
 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}/ceph/erasure-code/*.{a,la}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/rados-classes/*.{a,la}
-%if %{with hadoop}
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libhadoopcephfs.{la,a}
+%if %{with java}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libcephfs_jni.{la,a}
 %endif
+
 # packaged as %doc
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/ceph/sample.{ceph.conf,fetch_config}
 
@@ -228,8 +244,8 @@ fi
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	-n hadoop-cephfs -p /sbin/ldconfig
-%postun	-n hadoop-cephfs -p /sbin/ldconfig
+%post	-n java-cephfs -p /sbin/ldconfig
+%postun	-n java-cephfs -p /sbin/ldconfig
 
 %files
 %defattr(644,root,root,755)
@@ -238,38 +254,69 @@ 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-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}/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_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
+%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/mount.ceph
+%attr(755,root,root) /sbin/mount.fuse.ceph
+%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*
 %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) /sbin/ceph-create-keys
-%attr(755,root,root) /sbin/ceph-disk-activate
-%attr(755,root,root) /sbin/ceph-disk-prepare
-%attr(755,root,root) /sbin/mkcephfs
-%attr(755,root,root) /sbin/mount.ceph
-%dir %{_libdir}/ceph
-%attr(755,root,root) %{_libdir}/ceph/ceph_common.sh
+%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*
+%{_datadir}/ceph
 %config(noreplace) /etc/logrotate.d/ceph
 %config(noreplace) %{_sysconfdir}/bash_completion.d/rados
 %config(noreplace) %{_sysconfdir}/bash_completion.d/ceph
@@ -283,13 +330,14 @@ 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*
 %{_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*
@@ -297,6 +345,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
@@ -331,9 +380,21 @@ 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]
 
+%if %{with java}
+%files -n java-cephfs
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libcephfs_jni.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libcephfs_jni.so.1
+%attr(755,root,root) %{_libdir}/libcephfs_jni.so
+%{_javadir}/libcephfs.jar
+%endif
+
 %files fuse
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ceph-fuse
@@ -353,11 +414,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