From 5e756ed371406d5e91e4dafb53cc1ae44b35869e Mon Sep 17 00:00:00 2001 From: Owen Synge Date: Wed, 17 Jun 2015 00:03:28 +0200 Subject: [PATCH] ceph_spec buildep python sphinx for fedora Fedora, suse as well as centos >= 7 and rhel >= 7 use the same name for python-sphinx so add these conditionals. Note: Until OBS supports EPEL I cant test builds on centos and rhel so this extention of build deps is untested by Owen Synge. Signed-off-by: Owen Synge --- ceph.spec.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ceph.spec.in b/ceph.spec.in index 312cf97bd47d..30f8a51ebc06 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -79,6 +79,10 @@ BuildRequires: python-requests %if ( 0%{?rhel} > 0 && 0%{?rhel} < 7 ) || ( 0%{?centos} > 0 && 0%{?centos} < 7 ) BuildRequires: python-sphinx10 %endif +%if 0%{?fedora} || 0%{defined suse_version} || 0%{?rhel} >= 7 || 0%{?centos} >= 7 +BuildRequires: python-sphinx +%endif + BuildRequires: python-virtualenv BuildRequires: util-linux BuildRequires: xfsprogs @@ -97,7 +101,6 @@ BuildRequires: sharutils %endif %if 0%{defined suse_version} -BuildRequires: python-sphinx BuildRequires: net-tools BuildRequires: libbz2-devel BuildRequires: sharutils -- 2.47.3