diff options
| author | Sage Weil <sage@newdream.net> | 2017-07-18 15:41:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-18 15:41:00 +0200 |
| commit | 5f51a840543dcf83916bf30b732b46b5b09099c8 (patch) | |
| tree | 020434446feaf1fa5ef81a617377da5e720738d5 /ceph.spec.in | |
| parent | Merge pull request #16283 from xiexingguo/wip-osd-segfault (diff) | |
| parent | build/ops: rpm: socat is only needed for "make check" (diff) | |
| download | ceph-5f51a840543dcf83916bf30b732b46b5b09099c8.tar.xz ceph-5f51a840543dcf83916bf30b732b46b5b09099c8.zip | |
Merge pull request #15940 from smithfarm/wip-20425
build/ops: rpm: put mgr python build dependencies in make_check bcond
Reviewed-by: Kefu Chai <kchai@redhat.com>
Reviewed-by: Boris Ranto <branto@redhat.com>
Diffstat (limited to 'ceph.spec.in')
| -rw-r--r-- | ceph.spec.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/ceph.spec.in b/ceph.spec.in index a219a2359b5..0460a305947 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -102,6 +102,18 @@ BuildRequires: checkpolicy BuildRequires: selinux-policy-devel BuildRequires: /usr/share/selinux/devel/policyhelp %endif +%if 0%{with make_check} +%if 0%{?fedora} || 0%{?rhel} +BuildRequires: python-cherrypy +BuildRequires: python-werkzeug +%endif +%if 0%{?suse_version} +BuildRequires: python-CherryPy +BuildRequires: python-Werkzeug +%endif +BuildRequires: python-pecan +BuildRequires: socat +%endif BuildRequires: bc BuildRequires: gperf BuildRequires: cmake @@ -127,11 +139,8 @@ BuildRequires: pkgconfig BuildRequires: python BuildRequires: python-devel BuildRequires: python-nose -BuildRequires: python-pecan BuildRequires: python-requests BuildRequires: python-virtualenv -BuildRequires: python-werkzeug -BuildRequires: socat BuildRequires: snappy-devel BuildRequires: udev BuildRequires: util-linux @@ -159,7 +168,6 @@ BuildRequires: keyutils-devel BuildRequires: libopenssl-devel BuildRequires: lsb-release BuildRequires: openldap2-devel -BuildRequires: python-CherryPy BuildRequires: python-Cython BuildRequires: python-PrettyTable BuildRequires: python-Sphinx @@ -176,7 +184,6 @@ BuildRequires: openldap-devel BuildRequires: openssl-devel BuildRequires: redhat-lsb-core BuildRequires: Cython -BuildRequires: python-cherrypy BuildRequires: python-prettytable BuildRequires: python-sphinx %endif |