From d8e52a9e808e642ed6404ee7d45f46280ea0d571 Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Tue, 15 Jan 2019 15:43:13 +0100 Subject: [PATCH] rpm: move Python deps out of distro-conditional blocks The python%{_python_buildid}-bcrypt and python%{_python_buildid}-requests RPMs are identically named across all the RPM distros, so move them out of the distro conditional blocks. Signed-off-by: Nathan Cutler --- ceph.spec.in | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index f423901d811..22defe5e216 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -188,6 +188,7 @@ BuildRequires: xfsprogs-devel BuildRequires: xmlstarlet BuildRequires: yasm %if 0%{with make_check} +BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: python%{_python_buildid}-coverage BuildRequires: python%{_python_buildid}-nose BuildRequires: python%{_python_buildid}-pecan @@ -269,7 +270,6 @@ BuildRequires: python%{_python_buildid}-cherrypy BuildRequires: python%{_python_buildid}-jwt BuildRequires: python%{_python_buildid}-routes BuildRequires: python%{_python_buildid}-werkzeug -BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: xmlsec1 %endif %if 0%{?suse_version} @@ -278,7 +278,6 @@ BuildRequires: python%{_python_buildid}-PyJWT BuildRequires: python%{_python_buildid}-Routes BuildRequires: python%{_python_buildid}-Werkzeug BuildRequires: python%{_python_buildid}-numpy-devel -BuildRequires: python%{_python_buildid}-bcrypt BuildRequires: xmlsec1-devel %endif %endif @@ -377,13 +376,12 @@ Requires: python%{_python_buildid}-rbd = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-cephfs = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-rgw = %{_epoch_prefix}%{version}-%{release} Requires: python%{_python_buildid}-ceph-argparse = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-requests %if 0%{?fedora} || 0%{?rhel} Requires: python%{_python_buildid}-prettytable -Requires: python%{_python_buildid}-requests %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-PrettyTable -Requires: python%{_python_buildid}-requests %endif %if 0%{with libradosstriper} Requires: libradosstriper1 = %{_epoch_prefix}%{version}-%{release} @@ -426,6 +424,7 @@ Summary: Ceph Manager Daemon Group: System/Filesystems %endif Requires: ceph-base = %{_epoch_prefix}%{version}-%{release} +Requires: python%{_python_buildid}-bcrypt Requires: python%{_python_buildid}-pecan Requires: python%{_python_buildid}-six %if 0%{?fedora} || 0%{?rhel} @@ -459,7 +458,6 @@ Requires: python%{_python_buildid}-jwt Requires: python%{_python_buildid}-routes Requires: python%{_python_buildid}-werkzeug Requires: pyOpenSSL%{_python_buildid} -Requires: python%{_python_buildid}-bcrypt %endif %if 0%{?suse_version} Requires: python%{_python_buildid}-CherryPy @@ -467,7 +465,6 @@ Requires: python%{_python_buildid}-PyJWT Requires: python%{_python_buildid}-Routes Requires: python%{_python_buildid}-Werkzeug Requires: python%{_python_buildid}-pyOpenSSL -Requires: python%{_python_buildid}-bcrypt %endif %description mgr-dashboard ceph-mgr-dashboard is a manager plugin, providing a web-based application -- 2.39.5