diff --git a/.ceph.metadata b/.ceph.metadata index 9762296..c3eac48 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -9c76b298e1e659b9c5501003ac77fb28aab7823d SOURCES/ceph-15.2.12.tar.gz +1233ded30d9c264f82f56eae5c9aaacc43632f96 SOURCES/ceph-15.2.13.tar.gz diff --git a/README.md b/README.md index baaf323..d3a18a2 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.12-1.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.13-1.el8.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 1d2bc91..a807262 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -25,7 +25,7 @@ %bcond_with make_check %bcond_with cmake_verbose_logging %bcond_without ceph_test_package -%ifarch s390 s390x +%ifarch s390 %bcond_with tcmalloc %else %bcond_without tcmalloc @@ -100,7 +100,7 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.12 +Version: 15.2.13 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -119,9 +119,7 @@ Group: System/Filesystems URL: http://ceph.com/ Source0: %{?_remote_tarball_prefix}ceph-%{version}.tar.gz Patch0001: 0001-src-common-crc32c_intel_fast.patch -Patch0002: 0002-src-common-CMakeLists.txt.patch Patch0003: 0003-src-common-bitstr.h.patch -Patch0004: 0004-src-include-config-h-in-cmake.patch Source1: cmake-modules-BuildBoost.cmake.noautopatch # ceph 14.0.1 does not support 32-bit architectures, bugs #1727788, #1727787 ExcludeArch: i686 armv7hl @@ -163,7 +161,11 @@ BuildRequires: gcc-c++ %endif BuildRequires: gdbm %if 0%{with tcmalloc} -%if 0%{?fedora} || 0%{?rhel} +# libprofiler did not build on ppc64le until 2.7.90 +%if 0%{?fedora} || 0%{?rhel} >= 8 +BuildRequires: gperftools-devel >= 2.7 +%endif +%if 0%{?rhel} && 0%{?rhel} < 8 BuildRequires: gperftools-devel >= 2.6.1 %endif %if 0%{?suse_version} @@ -305,6 +307,7 @@ BuildRequires: lz4-devel >= 1.7 # distro-conditional make check dependencies %if 0%{with make_check} %if 0%{?fedora} || 0%{?rhel} +BuildRequires: golang-github-prometheus BuildRequires: libtool-ltdl-devel BuildRequires: xmlsec1 BuildRequires: xmlsec1-devel @@ -330,6 +333,7 @@ BuildRequires: python%{python3_pkgversion}-pyOpenSSL %endif %endif %if 0%{?suse_version} +BuildRequires: golang-github-prometheus-prometheus BuildRequires: libxmlsec1-1 BuildRequires: libxmlsec1-nss1 BuildRequires: libxmlsec1-openssl1 @@ -411,7 +415,7 @@ Requires: python%{python3_pkgversion}-setuptools Requires: util-linux Requires: xfsprogs Requires: which -%if 0%{?fedora} || 0%{?rhel} +%if 0%{?rhel} && 0%{?rhel} < 8 # The following is necessary due to tracker 36508 and can be removed once the # associated upstream bugs are resolved. %if 0%{with tcmalloc} @@ -708,6 +712,7 @@ Summary: Ceph daemon for immutable object cache %if 0%{?suse_version} Group: System/Filesystems %endif +Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: librados2 = %{_epoch_prefix}%{version}-%{release} %description immutable-object-cache Daemon for immutable object cache. @@ -736,6 +741,9 @@ Requires: librgw2 = %{_epoch_prefix}%{version}-%{release} %if 0%{?rhel} || 0%{?fedora} Requires: mailcap %endif +%if 0%{?weak_deps} +Recommends: gawk +%endif %description radosgw RADOS is a distributed object store used by the Ceph distributed storage system. This package provides a REST gateway to the @@ -1968,6 +1976,8 @@ fi %{_bindir}/radosgw-token %{_bindir}/radosgw-es %{_bindir}/radosgw-object-expirer +%{_bindir}/rgw-gap-list +%{_bindir}/rgw-gap-list-comparator %{_bindir}/rgw-orphan-list %{_libdir}/libradosgw.so* %{_mandir}/man8/radosgw.8* @@ -2393,6 +2403,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Wed May 26 2021 Kaleb S. KEITHLEY - 2:15.2.13-1 +- ceph 15.2.13 GA + * Thu May 13 2021 Kaleb S. KEITHLEY - 2:15.2.12-1 - ceph 15.2.12 GA