X-Git-Url: http://git.pld-linux.org/?p=packages%2Fceph.git;a=blobdiff_plain;f=ceph.spec;h=3e1e73924c7bcd4f4173a2b50a5b3a84418b24b9;hp=682681acf6a90be39399e20157ca758bb5814bff;hb=547a411;hpb=101b8bddb8d5141b329d594c87239539de2cc9ad

diff --git a/ceph.spec b/ceph.spec
index 682681a..3e1e739 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -10,12 +10,12 @@
 %bcond_with	accelio		# Accelio transport support [needs update for internal API changes]
 %bcond_with	cryptopp	# use cryptopp instead of NSS crypto/SSL
 %bcond_with	dpdk		# DPDK messaging (requires cryptopp instead of nss)
-%bcond_with	fcgi		# RADOS Gateway FCGI frontend
+%bcond_without	fcgi		# RADOS Gateway FCGI frontend
 %bcond_with	fio		# FIO engines support
 %bcond_without	pmem		# PMDK (persistent memory) support
 %bcond_with	spdk		# Ceph SPDK support (DPDK based)
 %bcond_without	system_rocksdb	# system RocksDB storage support
-%bcond_with	zfs		# ZFS support [not ready for zfs 0.8.x]
+%bcond_without	zfs		# ZFS support [not ready for zfs 0.8.x]
 %bcond_without	lttng		# LTTng tracing
 %bcond_without	babeltrace	# Babeltrace traces support
 %bcond_without	tcmalloc	# tcmalloc allocator
@@ -34,16 +34,14 @@ 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:	12.2.13
-Release:	1
+Release:	6
 License:	LGPL v2.1 (libraries), GPL v2 (some programs)
 Group:		Base
 Source0:	http://download.ceph.com/tarballs/%{name}-%{version}.tar.gz
 # Source0-md5:	38bd01cf8224c9ca081298e19ab6e5a1
 Source1:	ceph.sysconfig
-Source2:	cephctl
 Source3:	ceph.tmpfiles
 Patch0:		%{name}-init-fix.patch
-Patch1:		%{name}.logrotate.patch
 Patch2:		boost.patch
 Patch3:		%{name}-python.patch
 Patch4:		%{name}-types.patch
@@ -52,10 +50,12 @@ Patch6:		%{name}-rocksdb.patch
 Patch7:		%{name}-fcgi.patch
 Patch8:		%{name}-fio.patch
 Patch9:		%{name}-zfs.patch
+Patch10:	%{name}-includes.patch
 URL:		https://ceph.io/
 %{?with_accelio:BuildRequires:	accelio-devel}
 %{?with_babeltrace:BuildRequires:	babeltrace-devel}
 BuildRequires:	boost-devel >= 1.66
+BuildRequires:	boost-python-devel >= 1.66
 BuildRequires:	cmake >= 2.8.11
 %{?with_cryptopp:BuildRequires:	cryptopp-devel}
 BuildRequires:	curl-devel
@@ -97,6 +97,7 @@ BuildRequires:	python >= 1:2.7
 BuildRequires:	python-devel >= 1:2.7
 BuildRequires:	python-Cython
 BuildRequires:	python3-devel >= 1:3.2
+BuildRequires:	python3-Cython
 # upstream uses 3.0.0, rocksdb patch adjusts for 5.6.0 API change
 %{?with_system_rocksdb:BuildRequires:	rocksdb-devel >= 5.6.0}
 BuildRequires:	rpmbuild(macros) >= 1.671
@@ -122,7 +123,7 @@ Obsoletes:	gcephtool
 Obsoletes:	hadoop-cephfs
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		skip_post_check_so	libceph_lz4.so.* libceph_snappy.so.* libceph_zlib.so.* libceph_zstd.so.* libcls_.*.so.* libec_.*.so.*
+%define		skip_post_check_so	libceph_crypto_isal.so.* libceph_lz4.so.* libceph_snappy.so.* libceph_zlib.so.* libceph_zstd.so.* libcls_.*.so.* libec_.*.so.*
 
 %description
 Ceph is a distributed network file system designed to provide
@@ -269,7 +270,6 @@ uruchamiania demonów.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
@@ -278,6 +278,7 @@ uruchamiania demonów.
 %patch7 -p1
 %patch8 -p1
 %patch9 -p1
+%patch10 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' \
 	src/{ceph-create-keys,ceph-rest-api,mount.fuse.ceph} \
@@ -307,7 +308,8 @@ cd build
 	%{?with_system_rocksdb:-DWITH_SYSTEM_ROCKSDB=ON} \
 	-DWITH_SYSTEMD=ON \
 	%{?with_accelio:-DWITH_XIO=ON} \
-	%{?with_zfs:-DWITH_ZFS=ON}
+	%{?with_zfs:-DWITH_ZFS=ON} \
+	-DWITH_REENTRANT_STRSIGNAL=ON
 
 %{__make}
 
@@ -328,7 +330,6 @@ install -d $RPM_BUILD_ROOT%{_localstatedir}/{lib/ceph/{tmp,mon,osd,mds,mgr,rados
 cp -p src/logrotate.conf $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/ceph
 
 cp -p %{SOURCE1} $RPM_BUILD_ROOT/etc/sysconfig/ceph
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
 ln -sf /dev/null $RPM_BUILD_ROOT%{systemdunitdir}/ceph.service
 cp -p %{SOURCE3} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ceph.conf
 
@@ -446,7 +447,6 @@ fi
 %attr(755,root,root) %{_bindir}/ceph_smalliobenchrbd
 %attr(755,root,root) %{_bindir}/ceph_tpbench
 %attr(755,root,root) %{_bindir}/ceph_xattr_bench
-%attr(755,root,root) %{_bindir}/cephctl
 %attr(755,root,root) %{_bindir}/cephfs-data-scan
 %attr(755,root,root) %{_bindir}/cephfs-journal-tool
 %attr(755,root,root) %{_bindir}/cephfs-table-tool
@@ -472,15 +472,19 @@ fi
 %if "%{_libexecdir}" != "%{_libdir}"
 %dir %{_libexecdir}/ceph
 %endif
-%attr(755,root,root) %{_libexecdir}/ceph/ceph-monstore-update-crush.sh
+%{_libexecdir}/ceph/ceph_common.sh
 %attr(755,root,root) %{_libexecdir}/ceph/ceph-osd-prestart.sh
-%{_libdir}/ceph/ceph_common.sh
+%attr(755,root,root) %{_libdir}/ceph/ceph-monstore-update-crush.sh
 %{_libdir}/ceph/mgr
 %dir %{_libdir}/ceph/compressor
 %attr(755,root,root) %{_libdir}/ceph/compressor/libceph_lz4.so*
 %attr(755,root,root) %{_libdir}/ceph/compressor/libceph_snappy.so*
 %attr(755,root,root) %{_libdir}/ceph/compressor/libceph_zlib.so*
 %attr(755,root,root) %{_libdir}/ceph/compressor/libceph_zstd.so*
+%ifarch %{x8664}
+%dir %{_libdir}/ceph/crypto
+%attr(755,root,root) %{_libdir}/ceph/crypto/libceph_crypto_isal.so*
+%endif
 %dir %{_libdir}/ceph/erasure-code
 %ifarch %{x8664}
 %attr(755,root,root) %{_libdir}/ceph/erasure-code/libec_isa.so*