From 1f587492816f2ce5c683fd9a14ab0ed5a8844536 Mon Sep 17 00:00:00 2001 From: Zhiqiang Liu Date: Wed, 27 Jan 2021 17:41:04 +0800 Subject: [PATCH] ceph: fix python-prettytable require version problem ceph-common only supports python2, and it requires python-prettytable without using python<2|3>-prettytable. However, if we try to install python-prettytable, python3-prettytable will be finally installed. Here, we correct python-prettytable requires with python2-prettytable. Signed-off-by: Zhiqiang Liu --- ceph.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ceph.spec b/ceph.spec index d5d2a9e..9434064 100644 --- a/ceph.spec +++ b/ceph.spec @@ -68,7 +68,7 @@ ################################################################################# Name: ceph Version: 12.2.8 -Release: 9 +Release: 10 Epoch: 2 # define _epoch_prefix macro which will expand to the empty string if epoch is @@ -286,10 +286,10 @@ Requires: python-rbd = %{_epoch_prefix}%{version}-%{release} Requires: python-cephfs = %{_epoch_prefix}%{version}-%{release} Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} -Requires: python-prettytable +Requires: python2-prettytable %endif %if 0%{?suse_version} -Requires: python-PrettyTable +Requires: python2-PrettyTable %endif Requires: python-requests %{?systemd_requires} @@ -1797,6 +1797,9 @@ exit 0 %changelog +* Wed Jan 27 2021 Zhiqiang Liu - 1:12.2.8-10 +- correct ceph-common requires python2-prettytable version. + * Wed Dec 30 2020 yanglongkang - 1:12.2.8-9 - fix CVE-2020-12059 -- Gitee