Skip to content

Commit

Permalink
ceph.spec.in: add missing BuildRequires from SUSE block
Browse files Browse the repository at this point in the history
The %endif removed by f94f232 is restored.
The %else removed by 75e87a2 is restored.
The stray %endif added by d8abde3 is removed.

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

   BuildRequires: gperftools-devel

around line 133. June 3rd, in f94f232
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
75e87a2 Owen incorrectly fixed
this new problem by removing the %else that is near

   BuildRequires: gperftools-devel

around line 116, instead of reverting
f94f232. 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: ceph#11901

Signed-off-by: Loic Dachary <[email protected]>
  • Loading branch information
ldachary committed Jun 6, 2015
1 parent a8500ce commit 34e4dd9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion ceph.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -135,7 +137,6 @@ Requires(preun): chkconfig
Requires(preun): initscripts
BuildRequires: gperftools-devel
%endif
%endif

%description
Ceph is a massively scalable, open-source, distributed
Expand Down

0 comments on commit 34e4dd9

Please sign in to comment.