diff --git a/.ceph.metadata b/.ceph.metadata index 8de24cf..9feb3a1 100644 --- a/.ceph.metadata +++ b/.ceph.metadata @@ -1 +1 @@ -0442c17a30e4186910df44137f321d9ca9287b0e SOURCES/ceph-16.1.0-944-ge53ee8bd.tar.bz2 +d5ca6a096d550e7a91c68518d7006f7f72bd1f0d SOURCES/ceph-16.1.0.tar.bz2 diff --git a/README.md b/README.md index cb39b07..94bbe55 100644 --- a/README.md +++ b/README.md @@ -22,5 +22,5 @@ Create a src.rpm with: To build: - $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.1.0-0.1.snapshot.el8.src.rpm + $ cbs build [--scratch] storage8-ceph-pacific-el8 ceph-16.1.0-2.el8.src.rpm diff --git a/SPECS/ceph.spec b/SPECS/ceph.spec index 5972f24..bc308d4 100644 --- a/SPECS/ceph.spec +++ b/SPECS/ceph.spec @@ -126,7 +126,7 @@ ################################################################################# Name: ceph Version: 16.1.0 -Release: 1%{?dist} +Release: 2%{?dist} %if 0%{?fedora} || 0%{?rhel} Epoch: 2 %endif @@ -247,9 +247,9 @@ BuildRequires: %{luarocks_package_name} %if 0%{with make_check} BuildRequires: jq BuildRequires: libuuid-devel -BuildRequires: python%{python3_pkgversion}-bcrypt +BuildRequires: python-bcrypt BuildRequires: python%{python3_pkgversion}-nose -BuildRequires: python%{python3_pkgversion}-pecan +BuildRequires: python-pecan BuildRequires: python%{python3_pkgversion}-requests BuildRequires: python%{python3_pkgversion}-dateutil BuildRequires: python%{python3_pkgversion}-coverage @@ -358,9 +358,9 @@ BuildRequires: xmlsec1-nss %endif BuildRequires: xmlsec1-openssl BuildRequires: xmlsec1-openssl-devel -BuildRequires: python%{python3_pkgversion}-cherrypy +BuildRequires: python-cherrypy BuildRequires: python%{python3_pkgversion}-jwt -BuildRequires: python%{python3_pkgversion}-routes +BuildRequires: python-routes BuildRequires: python%{python3_pkgversion}-scipy BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: python%{python3_pkgversion}-pyOpenSSL @@ -571,9 +571,9 @@ Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} Requires: ceph-grafana-dashboards = %{_epoch_prefix}%{version}-%{release} Requires: ceph-prometheus-alerts = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} -Requires: python%{python3_pkgversion}-cherrypy +Requires: python-cherrypy Requires: python%{python3_pkgversion}-jwt -Requires: python%{python3_pkgversion}-routes +Requires: python-routes Requires: python%{python3_pkgversion}-werkzeug %if 0%{?weak_deps} Recommends: python%{python3_pkgversion}-saml @@ -614,13 +614,13 @@ BuildArch: noarch %if 0%{?suse_version} Group: System/Filesystems %endif -Requires: python%{python3_pkgversion}-bcrypt -Requires: python%{python3_pkgversion}-pecan +Requires: python-bcrypt +Requires: python-pecan Requires: python%{python3_pkgversion}-pyOpenSSL Requires: python%{python3_pkgversion}-requests Requires: python%{python3_pkgversion}-dateutil %if 0%{?fedora} || 0%{?rhel} >= 8 -Requires: python%{python3_pkgversion}-cherrypy +Requires: python-cherrypy Requires: python%{python3_pkgversion}-pyyaml Requires: python%{python3_pkgversion}-werkzeug %endif @@ -643,7 +643,7 @@ Summary: Ceph Manager module for Rook-based orchestration Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-kubernetes +Requires: python-kubernetes Requires: python%{python3_pkgversion}-jsonpatch %description mgr-rook ceph-mgr-rook is a ceph-mgr module for orchestration functions using @@ -656,7 +656,7 @@ Summary: Ceph Manager module to orchestrate ceph-events to kubernetes' events AP Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-kubernetes +Requires: python-kubernetes %description mgr-k8sevents ceph-mgr-k8sevents is a ceph-mgr module that sends every ceph-events to kubernetes' events API @@ -668,7 +668,7 @@ BuildArch: noarch Group: System/Filesystems %endif Requires: ceph-mgr = %{_epoch_prefix}%{version}-%{release} -Requires: python%{python3_pkgversion}-remoto +Requires: python-remoto Requires: cephadm = %{_epoch_prefix}%{version}-%{release} %if 0%{?suse_version} Requires: openssh @@ -2461,6 +2461,9 @@ exit 0 %config %{_sysconfdir}/prometheus/ceph/ceph_default_alerts.yml %changelog +* Sat Mar 27 2021 Kaleb S. KEITHLEY - 2:16.1.0-2 +- 16.1.0 RC, misc python3-* -> python-* + * Thu Mar 25 2021 Kaleb S. KEITHLEY - 2:16.1.0-1 - 16.1.0 RC