Merge pull request ceph#4878 from dachary/wip-11901-spec

ceph.spec.in: add missing BuildRequires from SUSE block Reviewed-by: Nathan Cutler <[email protected]>
osynge · Jun 6, 2015 · eefdeb6 · eefdeb6
2 parents a8500ce + 739ef0f
commit eefdeb6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/ceph.spec.in b/ceph.spec.in
@@ -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

diff --git a/install-deps.sh b/install-deps.sh
@@ -73,7 +73,8 @@ CentOS|Fedora|RedHatEnterpriseServer)
                 ;;
         esac
         sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec
-        $SUDO yum-builddep -y $DIR/ceph.spec || exit 1
+        $SUDO yum-builddep -y $DIR/ceph.spec 2>&1 | tee $DIR/yum-builddep.out
+        ! grep -q -i error: $DIR/yum-builddep.out || exit 1
         ;;
 *SUSE*)
         sed -e 's/@//g' < ceph.spec.in > $DIR/ceph.spec