ceph.spec.in: add missing BuildRequires from SUSE block

The %endif removed by f94f23297c05019db754ec53b4ceaea7706152c9 is restored.
The %else removed by 75e87a20dac05441b97ce99dea76fff8e3a863ac is restored.
The stray %endif added by d8abde3338 is removed.

May 29th, in d8abde3338 Owen added a stray
%endif after

   BuildRequires: gperftools-devel

around line 133. June 3rd, in f94f23297c05019db754ec53b4ceaea7706152c9
Ken correctly attributed the error

     "error: /srv/autobuild-ceph/gitbuilder.git/build/ceph.spec:140: Got a
      %endif with no %if"

to a stray %endif but did not remove the one causing problem and in
doing so created another problem. June 4th, in
75e87a20dac05441b97ce99dea76fff8e3a863ac Owen incorrectly fixed
this new problem by removing the %else that is near

   BuildRequires: gperftools-devel

around line 116, instead of reverting
f94f23297c05019db754ec53b4ceaea7706152c9. As a consequence the
ceph.spec.in became syntactically correct but implemented an if/else
logic different from what was intended originally and a number of
BuildRequires became exclusive to SUSE and were not installed for CentOS
7 etc.

http://tracker.ceph.com/issues/11901 Fixes: #11901

Signed-off-by: Loic Dachary <ldachary@redhat.com>
This commit is contained in:
Loic Dachary 2015-06-06 10:20:02 +02:00
parent a8500ce981
commit 34e4dd9c8a

View File

@ -116,8 +116,10 @@ Requires: gptfdisk
%if 0%{with tcmalloc}
BuildRequires: gperftools-devel
%endif
%else
Requires: scsirastools
BuildRequires: google-perftools-devel
%endif
Recommends: logrotate
BuildRequires: %insserv_prereq
BuildRequires: mozilla-nss-devel
@ -135,7 +137,6 @@ Requires(preun): chkconfig
Requires(preun): initscripts
BuildRequires: gperftools-devel
%endif
%endif
%description
Ceph is a massively scalable, open-source, distributed