diff --git a/.ceph.metadata b/.ceph.metadata index 777c67e..a642b62 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1,2 +1 @@ -81c88c8705ad45e6b83ffa8013f007d84b5cb89f SOURCES/ceph-14.2.15.tar.gz -91df7c632db89b4d2d38f512380880fbf0fc0bac SOURCES/ceph-14.2.16.tar.gz +c3cf3ef9fd061a01bc096c1a23c9d4eab8e86a4b SOURCES/ceph-14.2.17.tar.gz diff --git a/README.md b/README.md index 76d46c3..dafb0e9 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,6 @@ E.g. build the src.rpm with: To build: - $ cbs build [--scratch] storage7-ceph-nautilus-el7 ceph-14.2.16-1.el7.src.rpm + $ cbs build [--scratch] storage7-ceph-nautilus-el7 ceph-14.2.17-1.el7.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 46865bc..6ea6445 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -110,7 +110,7 @@ # main package definition ################################################################################# Name: ceph -Version: 14.2.16 +Version: 14.2.17 Release: 1%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 @@ -291,14 +291,24 @@ BuildRequires: pyOpenSSL%{_python_buildid} %else BuildRequires: python%{_python_buildid}-pyOpenSSL %endif +BuildRequires: libtool-ltdl-devel BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes BuildRequires: python%{_python_buildid}-scipy BuildRequires: python%{_python_buildid}-werkzeug BuildRequires: xmlsec1 +BuildRequires: xmlsec1-devel +BuildRequires: xmlsec1-nss +BuildRequires: xmlsec1-openssl +BuildRequires: xmlsec1-openssl-devel %endif %if 0%{?suse_version} +BuildRequires: libxmlsec1-1 +BuildRequires: libxmlsec1-nss1 +BuildRequires: libxmlsec1-openssl1 +BuildRequires: xmlsec1-devel +BuildRequires: xmlsec1-openssl-devel BuildRequires: python%{_python_buildid}-CherryPy BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes @@ -309,7 +319,6 @@ BuildRequires: python%{_python_buildid}-pecan BuildRequires: python%{_python_buildid}-pyOpenSSL BuildRequires: python%{_python_buildid}-tox BuildRequires: rpm-build -BuildRequires: xmlsec1-devel %endif %endif # lttng and babeltrace for rbd-replay-prep @@ -509,6 +518,7 @@ Requires: python%{_python_buildid}-CherryPy Requires: python%{_python_buildid}-PyJWT Requires: python%{_python_buildid}-Routes Requires: python%{_python_buildid}-Werkzeug +Recommends: python%{_python_buildid}-python3-saml %endif %if 0%{?rhel} == 7 Requires: pyOpenSSL @@ -1303,7 +1313,7 @@ ln -sf %{_sbindir}/mount.ceph %{buildroot}/sbin/mount.ceph install -m 0644 -D udev/50-rbd.rules %{buildroot}%{_udevrulesdir}/50-rbd.rules # sudoers.d -install -m 0600 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl +install -m 0440 -D sudoers.d/ceph-osd-smartctl %{buildroot}%{_sysconfdir}/sudoers.d/ceph-osd-smartctl %if 0%{?rhel} >= 8 pathfix.py -pni "%{__python3} %{py3_shbang_opts}" %{buildroot}%{_bindir}/* @@ -2319,6 +2329,9 @@ exit 0 %changelog +* Thu Mar 11 2021 Kaleb S. KEITHLEY - 2:14.2.17-1 +- ceph 14.2.17 GA + * Tue Dec 22 2020 Kaleb S. KEITHLEY - 2:14.2.16-1 - ceph 14.2.16 GA