[packages/ceph: 8/8] Merge branch 'merge-16'

[qboosh]

commit d93282260c89b65cd67e50ecb494fda73fe5f072
Merge: 2b3ddb3 737284c
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Jun 15 18:36:59 2022 +0200

    Merge branch 'merge-16'

 ceph-fio.patch      |  17 ++++++++
 ceph-tcmalloc.patch |  19 ---------
 ceph.spec           | 116 ++++++++++++++++++++++++++++++++--------------------
 3 files changed, 89 insertions(+), 63 deletions(-)
---
diff --cc ceph.spec
index abf9b09,83adbab..5d8bafa
--- a/ceph.spec
+++ b/ceph.spec
@@@ -323,9 -350,8 +350,10 @@@ cd buil
  %endif
  	-DALLOCATOR="%{?with_tcmalloc:tcmalloc}%{!?with_tcmalloc:libc}" \
  	-DFIO_INCLUDE_DIR=/usr/include/fio \
- 	-DWITH_PYTHON3=%{py3_ver} \
+ 	%{?with_java:-DJAVA_HOME:PATH=%{java_home}} \
++	-DLUA_INCLUDE_DIR=%{_includedir}/lua \
  	-DPYTHON=%{__python3} \
 +	-DSPHINX_BUILD=/usr/bin/sphinx-build \
  	%{!?with_babeltrace:-DWITH_BABELTRACE=OFF} \
  %if %{with pmem}
  	-DWITH_BLUESTORE_PMEM=ON \
@@@ -337,13 -362,15 +364,13 @@@
  	%{?with_fio:-DWITH_FIO=ON} \
  	%{?with_kerberos:-DWITH_GSSAPI=ON} \
  	%{!?with_lttng:-DWITH_LTTNG=OFF} \
--	-DLUA_INCLUDE_DIR=%{_includedir}/lua \
 -	-DSPHINX_BUILD=/usr/bin/sphinx-build \
  	-DWITH_LZ4=ON \
- 	%{?with_cryptopp:-DWITH_NSS=OFF} \
+ 	%{!?with_angular:-DWITH_MGR_DASHBOARD_FRONTEND=OFF} \
  	-DWITH_OCF=ON \
+ 	-DWITH_PYTHON3=%{py3_ver} \
  	%{?with_fcgi:-DWITH_RADOSGW_FCGI_FRONTEND=ON} \
- 	-DWITH_MGR_DASHBOARD_FRONTEND=OFF \
  	%{!?with_rdma:-DWITH_RDMA=OFF} \
+ 	-DWITH_REENTRANT_STRSIGNAL=ON \
  	%{?with_spdk:-DWITH_SPDK=ON} \
  	-DWITH_SYSTEM_BOOST=ON \
  	-DWITH_SYSTEM_LIBURING=ON \
@@@ -385,9 -413,10 +413,11 @@@ cp -p %{SOURCE3} $RPM_BUILD_ROOT%{syste
  
  # packaged as %doc
  %{__rm} $RPM_BUILD_ROOT%{_docdir}/sample.ceph.conf
 +
- %{__sed} -E -i -e '1s,#!\s*/usr/bin/env\s+bash(\s|$),#!/bin/bash\1,' \
- 	$RPM_BUILD_ROOT%{_bindir}/{ceph-post-file,rbd-replay-many,rbdmap,rgw-gap-list,rgw-orphan-list}
+ %if %{with angular}
+ %{__rm} $RPM_BUILD_ROOT%{_libdir}/ceph/mgr/dashboard/HACKING.rst
+ %{__rm} $RPM_BUILD_ROOT%{_libdir}/ceph/mgr/{.gitignore,dashboard/static/AdminLTE-2.3.7/{.gitignore,.jshintrc,README.md}}
+ %endif
  
  %clean
  rm -rf $RPM_BUILD_ROOT
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/ceph.git/commitdiff/d93282260c89b65cd67e50ecb494fda73fe5f072