SHA256
1
0
forked from pool/ceph

Accepting request 519567 from filesystems:ceph:luminous

Upstream 12.2.0 release

OBS-URL: https://build.opensuse.org/request/show/519567
OBS-URL: https://build.opensuse.org/package/show/filesystems:ceph/ceph?expand=0&rev=125
This commit is contained in:
2017-08-29 21:11:31 +00:00
committed by Git OBS Bridge
parent bd46d3ad79
commit 1bcfb33053
7 changed files with 33 additions and 9 deletions

View File

@@ -68,7 +68,7 @@
# main package definition
#################################################################################
Name: ceph
Version: 12.1.4+git.1502953626.155adb5253
Version: 12.2.0+git.1504013812.01ea30bcc9
Release: 0%{?dist}
%if 0%{?fedora} || 0%{?rhel}
Epoch: 2
@@ -887,7 +887,7 @@ echo "System limits:"
ulimit -a
lo_jobs_reduced=
if test -n "$lo_jobs" -a "$lo_jobs" -gt 1 ; then
mem_per_process=1600
mem_per_process=1700
max_mem=$(LANG=C free -t -m | sed -n "s|^Mem: *\([0-9]*\).*$|\1|p")
max_jobs="$(($max_mem / $mem_per_process))"
test "$lo_jobs" -gt "$max_jobs" && lo_jobs="$max_jobs" && lo_jobs_reduced="yes" && echo "Warning: Reducing build parallelism to -j$max_jobs because of memory limits"
@@ -1028,6 +1028,8 @@ rm -rf %{buildroot}
%{_mandir}/man8/ceph-detect-init.8*
%{_mandir}/man8/ceph-create-keys.8*
%{_mandir}/man8/ceph-disk.8*
%{_mandir}/man8/ceph-volume.8*
%{_mandir}/man8/ceph-volume-systemd.8*
%{_mandir}/man8/ceph-run.8*
%{_mandir}/man8/crushtool.8*
%{_mandir}/man8/osdmaptool.8*