RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 01:47:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

build/ops: rpm: move distro-conditional make check deps

Browse Source 
These were in the wrong section.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2018-01-24 06:44:37 +01:00
parent 5ec2364421
commit e9e62cbf81
1 changed files with 30 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ceph.spec.in
View File

@ -112,33 +112,6 @@ BuildRequires: sharutils
BuildRequires: checkpolicy
BuildRequires: selinux-policy-devel
%endif
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
%if 0%{with python2}
BuildRequires: python-cherrypy
BuildRequires: python-pecan
BuildRequires: python-werkzeug
%else
BuildRequires: python%{python3_pkgversion}-cherrypy
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-werkzeug
%endif
%endif
%if 0%{?suse_version}
%if 0%{with python2}
BuildRequires: python-CherryPy
BuildRequires: python-Werkzeug
BuildRequires: python-pecan
BuildRequires: python-numpy-devel
%else
BuildRequires: python%{python3_pkgversion}-CherryPy
BuildRequires: python%{python3_pkgversion}-Werkzeug
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-numpy-devel
%endif
%endif
BuildRequires: socat
%endif
BuildRequires: bc
BuildRequires: gperf
BuildRequires: cmake
@ -186,6 +159,9 @@ BuildRequires: python%{python3_pkgversion}-requests
BuildRequires: python%{python3_pkgversion}-virtualenv
%endif
BuildRequires: snappy-devel
%if 0%{with make_check}
BuildRequires: socat
%endif
BuildRequires: udev
BuildRequires: util-linux
BuildRequires: valgrind-devel
@ -255,6 +231,33 @@ BuildRequires: python3-devel
BuildRequires: python3-setuptools
BuildRequires: python3-Cython
%endif
# distro-conditional make check dependencies
%if 0%{with make_check}
%if 0%{?fedora} || 0%{?rhel}
%if 0%{with python2}
BuildRequires: python-cherrypy
BuildRequires: python-pecan
BuildRequires: python-werkzeug
%else
BuildRequires: python%{python3_pkgversion}-cherrypy
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-werkzeug
%endif
%endif
%if 0%{?suse_version}
%if 0%{with python2}
BuildRequires: python-CherryPy
BuildRequires: python-Werkzeug
BuildRequires: python-pecan
BuildRequires: python-numpy-devel
%else
BuildRequires: python%{python3_pkgversion}-CherryPy
BuildRequires: python%{python3_pkgversion}-Werkzeug
BuildRequires: python%{python3_pkgversion}-pecan
BuildRequires: python%{python3_pkgversion}-numpy-devel
%endif
%endif
%endif
# lttng and babeltrace for rbd-replay-prep
%if %{with lttng}
%if 0%{?fedora} || 0%{?rhel}