Update ceph.spec for ceph-0.47

Add BuildRequires: libxml2-devel.
Move BuildRequires: libcurl-devel to a more proper place.

[libs3 and librgw.h bits of patch dropped -sw]

Signed-off-by: Alexandre Oliva <oliva@lsd.ic.unicamp.br>
Signed-off-by: Sage Weil <sage@newdream.net>

diff --git a/ceph.spec.in b/ceph.spec.in
index b3dd3f03b2fa24868a9f6e6def9fb3a0cf0e5738..80e6dc784ca4cb47354cbf81834382ae24ac5850 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -37,6 +37,8 @@ BuildRequires:        gdbm
 BuildRequires: pkgconfig
 BuildRequires: python
 BuildRequires:  libaio-devel
+BuildRequires:  libcurl-devel
+BuildRequires:  libxml2-devel
 
 #################################################################################
 # specific
@@ -55,7 +57,6 @@ Requires(post):       chkconfig
 Requires(preun):chkconfig
 Requires(preun):initscripts
 %endif
-BuildRequires: libcurl-devel
 %if 0%{with tcmalloc}
 # use isa so this will not be satisfied by
 # google-perftools-devel.i686 on a x86_64 box
@@ -232,6 +233,9 @@ make -j$(getconf _NPROCESSORS_ONLN)
 
 %install
 make DESTDIR=$RPM_BUILD_ROOT install
+rmdir $RPM_BUILD_ROOT/bin
+rmdir $RPM_BUILD_ROOT/lib
+rmdir $RPM_BUILD_ROOT/include
 find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';'
 find $RPM_BUILD_ROOT -type f -name "*.a" -exec rm -f {} ';'
 install -D src/init-ceph $RPM_BUILD_ROOT%{_initrddir}/ceph