Fixes for missing and doubly-packaged files in ceph.spec

Commit Message

Alexandre Oliva Feb. 12, 2014, 12:47 p.m. UTC

In order to upgrade my servers to the Fedora-based Hatrack 20, I had to
roll out my own rpms, because there aren't Fedora 20 builds at ceph.com.
This revealed some errors in the ceph spec file, that caused errors
because some ceph_test files were not packaged at all, and warnings
because some fileswithin libdir/ceph were packaged twice.  I added the
ceph_test binaries and avoided the double packaging of
libdir/ceph/erasure stuff by marking libdir/ceph with %dir.  This in
turn left ceph_common.sh out, because it had only been covered by the
recursive packaging of libdir/ceph, so I put it in explicitly.

Signed-off-by: Alexandre Oliva <[e-mail]>

---
 ceph.spec.in |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

Patch

diff --git a/ceph.spec.in b/ceph.spec.in
index fb599fa..82eb102 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -416,7 +416,8 @@  fi
 %{_sbindir}/rcceph
 /sbin/mkcephfs
 /sbin/mount.ceph
-%{_libdir}/ceph
+%dir %{_libdir}/ceph
+%{_libdir}/ceph/ceph_common.sh
 %dir %{_libdir}/rados-classes
 %{_libdir}/rados-classes/libcls_rbd.so*
 %{_libdir}/rados-classes/libcls_hello.so*
@@ -630,6 +631,7 @@  fi
 %{_bindir}/ceph_filestore_dump
 %{_bindir}/ceph_filestore_tool
 %{_bindir}/ceph_streamtest
+%{_bindir}/ceph_test_c_headers
 %{_bindir}/ceph_test_cfuse_cache_invalidate
 %{_bindir}/ceph_test_cls_hello
 %{_bindir}/ceph_test_cls_lock
@@ -649,6 +651,7 @@  fi
 %{_bindir}/ceph_test_filestore_idempotent
 %{_bindir}/ceph_test_filestore_idempotent_sequence
 %{_bindir}/ceph_test_filestore_workloadgen
+%{_bindir}/ceph_test_get_blkdev_size
 %{_bindir}/ceph_test_ioctls
 %{_bindir}/ceph_test_keyvaluedb_atomicity
 %{_bindir}/ceph_test_keyvaluedb_iterators