diff --git a/ceph.spec b/ceph.spec index 4031b87eb2bf9e713f2b81782932d9170423b99a..be7d680c271c60b2cb9850c3e36060cee047c73b 100644 --- a/ceph.spec +++ b/ceph.spec @@ -125,7 +125,7 @@ ################################################################################# Name: ceph Version: 16.2.7 -Release: 2 +Release: 3 %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} Epoch: 2 %endif @@ -193,9 +193,8 @@ BuildRequires: libblkid-devel >= 2.17 BuildRequires: cryptsetup-devel BuildRequires: libcurl-devel BuildRequires: libcap-ng-devel -BuildRequires: fmt-devel -#BuildRequires: pkgconfig(libudev) -BuildRequires: libudev-devel +BuildRequires: fmt-devel >= 5.2.1 +BuildRequires: pkgconfig(libudev) BuildRequires: libnl3-devel BuildRequires: liboath-devel BuildRequires: libtool @@ -1240,7 +1239,7 @@ export CXXFLAGS=$(echo $RPM_OPT_FLAGS | sed -e 's/-Wp,-D_FORTIFY_SOURCE=2//g') %endif # Parallel build settings ... -CEPH_MFLAGS_JOBS="-j20" +CEPH_MFLAGS_JOBS="%{?_smp_mflags}" CEPH_SMP_NCPUS=$(echo "$CEPH_MFLAGS_JOBS" | sed 's/-j//') %if 0%{?__isa_bits} == 32 # 32-bit builds can use 3G memory max, which is not enough even for -j2 @@ -2484,6 +2483,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Mar 18 2022 liuqinfei - 1:16.2.7-3 +- keep the ceph.spec align with native community + * Fri Mar 11 2022 wangzengliang - 1:16.2.7-2 - fix * recognition error when install @@ -2514,13 +2516,13 @@ exit 0 * Fri Jan 22 2021 yanglongkang - 1:14.2.15-1 - update to 14.2.15 -* Thu Nov 20 2020 yanglongkang - 1:12.2.8-9 +* Fri Nov 20 2020 yanglongkang - 1:12.2.8-9 - remove python2 dependency -* Thu Nov 03 2020 yanglongkang - 1:12.2.8-8 +* Tue Nov 03 2020 yanglongkang - 1:12.2.8-8 - remove python2 dependency -* Fri Oct 28 2020 chixinze - 1:12.2.8-7 +* Wed Oct 28 2020 chixinze - 1:12.2.8-7 - ceph.spec: fix source code download URL * Fri Mar 20 2020 hy-euler - 1:12.2.8-6