el6 ppc64 does not have gperftools, merge from origin/el6

This commit is contained in:
Kaleb S. KEITHLEY 2014-06-05 02:52:02 -04:00
parent 6c2f2c4e79
commit cca983bdeb

View File

@ -17,9 +17,15 @@ Patch1: ceph-fix-sbin-target.patch
BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel, BuildRequires: fuse-devel, libtool, libtool-ltdl-devel, boost-devel,
BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel, BuildRequires: libedit-devel, fuse-devel, git, perl, gdbm, libaio-devel,
# google-perftools is not available on these: # google-perftools is not available on these:
%if ( ! (0%{?rhel} && 0%{?rhel} <= 6 ) )
%ifnarch ppc s390 s390x %ifnarch ppc s390 s390x
BuildRequires: gperftools-devel BuildRequires: gperftools-devel
%endif %endif
%else
%ifnarch ppc ppc64 s390 s390x
BuildRequires: gperftools-devel
%endif
%endif
BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++ BuildRequires: cryptopp-devel, libatomic_ops-static, gcc-c++
BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel BuildRequires: pkgconfig, libcurl-devel, keyutils-libs-devel
BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel BuildRequires: gtkmm24-devel, gtk2-devel, libuuid, libuuid-devel
@ -295,6 +301,9 @@ fi
%{_sysconfdir}/bash_completion.d/radosgw-admin %{_sysconfdir}/bash_completion.d/radosgw-admin
%changelog %changelog
* Thu Jun 5 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com>
- el6 ppc64 does not have gperftools, merge from origin/el6
* Thu Jun 5 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 0.81.0-1 * Thu Jun 5 2014 Kaleb S. KEITHLEY <kkeithle[at]redhat.com> - 0.81.0-1
- ceph-0.81.0 - ceph-0.81.0