X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ceph.spec;h=c55b617918ffb6547a1e6048db43e86c9ad07bcb;hb=b607360df23c73153fc0346db16a8ba3f1079741;hp=4b644f6347b37399dbf3c1f9a400da693d0c5881;hpb=2d841236c421c5af12041f3e317f80c3956a376c;p=packages%2Fceph.git

diff --git a/ceph.spec b/ceph.spec
index 4b644f6..c55b617 100644
--- a/ceph.spec
+++ b/ceph.spec
@@ -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:	4
 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
@@ -272,7 +270,6 @@ uruchamiania demonów.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 %patch2 -p0
 %patch3 -p1
 %patch4 -p1
@@ -311,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}
 
@@ -332,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
 
@@ -450,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
@@ -485,6 +481,10 @@ fi
 %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*