diff --git a/.ceph.metadata b/.ceph.metadata index a14d406..ceca97e 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -2c1860b55da34fa4fcd6d33562139599fae2736f SOURCES/ceph-15.2.4.tar.gz +7ee34187ef4e71105b2082d33e197e32f3f8e8ab SOURCES/ceph-15.2.5.tar.gz diff --git a/README.md b/README.md index b7a8453..200a865 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.4-1.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-octopus-el8 ceph-15.2.5-1.el8.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index c82dd98..66164d3 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -100,8 +100,8 @@ # main package definition ################################################################################# Name: ceph -Version: 15.2.4 -Release: 2%{?dist} +Version: 15.2.5 +Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -756,6 +756,7 @@ Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} Requires: lvm2 Requires: sudo Requires: libstoragemgmt +Requires: python%{python3_pkgversion}-ceph-common = %{_epoch_prefix}%{version}-%{release} %description osd ceph-osd is the object storage daemon for the Ceph distributed file system. It is responsible for storing objects on a local file system @@ -997,6 +998,12 @@ descriptions, and submitting the command to the appropriate daemon. %package -n python%{python3_pkgversion}-ceph-common Summary: Python 3 utility libraries for Ceph +%if 0%{?fedora} || 0%{?rhel} >= 8 +Requires: python%{python3_pkgversion}-pyyaml +%endif +%if 0%{?suse_version} +Requires: python%{python3_pkgversion}-PyYAML +%endif %if 0%{?suse_version} Group: Development/Libraries/Python %endif @@ -2364,6 +2371,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Fri Oct 9 2020 Kaleb S. KEITHLEY - 2:15.2.5-1 +- ceph 15.2.5 GA + * Tue Aug 11 2020 Kaleb S. KEITHLEY - 2:15.2.4-2 - ceph 15.2.4, bump epoch, ceph-14.x.x is 2 (sigh) so -15 must also be 2