packages/ceph
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ceph: fix python-prettytable require version problem

Browse Source 
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 <liuzhiqiang26@huawei.com>
This commit is contained in:
Zhiqiang Liu 2021-01-27 17:41:04 +08:00
parent e2f04cadc4
commit 10e119f42d
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ceph.spec
View File

@ -68,7 +68,7 @@
################################################################################# #################################################################################
Name: ceph Name: ceph
Version: 12.2.8 Version: 12.2.8
Release: 9 Release: 10
Epoch: 2 Epoch: 2
# define _epoch_prefix macro which will expand to the empty string if epoch is # 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-cephfs = %{_epoch_prefix}%{version}-%{release}
Requires: python-rgw = %{_epoch_prefix}%{version}-%{release} Requires: python-rgw = %{_epoch_prefix}%{version}-%{release}
%if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler} %if 0%{?fedora} || 0%{?rhel} || 0%{?openEuler}
Requires: python-prettytable Requires: python2-prettytable
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
Requires: python-PrettyTable Requires: python2-PrettyTable
%endif %endif
Requires: python-requests Requires: python-requests
%{?systemd_requires} %{?systemd_requires}
@ -1797,6 +1797,9 @@ exit 0
%changelog %changelog
* Wed Jan 27 2021 Zhiqiang Liu <liuzhiqiang26@huawei.com> - 1:12.2.8-10
- correct ceph-common requires python2-prettytable version.
* Wed Dec 30 2020 yanglongkang <yanglongkang@huawei.com> - 1:12.2.8-9 * Wed Dec 30 2020 yanglongkang <yanglongkang@huawei.com> - 1:12.2.8-9
- fix CVE-2020-12059 - fix CVE-2020-12059