From: Nathan Cutler Date: Mon, 22 May 2017 14:04:57 +0000 (+0200) Subject: build/ops: rpm: move python-prettytable to distro-conditional section X-Git-Tag: v12.1.0~57^2~54^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08bc5e6528c9090ee90652b3d9746c64dc41dff7;p=ceph.git build/ops: rpm: move python-prettytable to distro-conditional section The correct package name in SUSE is python-PrettyTable Signed-off-by: Nathan Cutler --- diff --git a/ceph.spec.in b/ceph.spec.in index 569771103fad..32f10e5bc51b 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -122,7 +122,6 @@ BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose -BuildRequires: python-prettytable BuildRequires: python-requests BuildRequires: python-virtualenv BuildRequires: snappy-devel @@ -153,6 +152,7 @@ BuildRequires: lsb-release BuildRequires: openldap2-devel BuildRequires: python-CherryPy BuildRequires: python-Cython +BuildRequires: python-PrettyTable BuildRequires: python-Sphinx BuildRequires: rdma-core-devel %endif @@ -168,6 +168,7 @@ BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython BuildRequires: python-cherrypy +BuildRequires: python-prettytable BuildRequires: python-sphinx %endif # python34-... for RHEL, python3-... for all other supported distros @@ -262,7 +263,12 @@ Requires: python-rados = %{epoch}:%{version}-%{release} Requires: python-rbd = %{epoch}:%{version}-%{release} Requires: python-cephfs = %{epoch}:%{version}-%{release} Requires: python-rgw = %{epoch}:%{version}-%{release} +%if 0%{?fedora} || 0%{?rhel} Requires: python-prettytable +%endif +%if 0%{?suse_version} +Requires: python-PrettyTable +%endif Requires: python-requests %{?systemd_requires} %if 0%{?suse_version}