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

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

[Alexandre Oliva]

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 <oliva@gnu.org>

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

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

-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist     Red Hat Brazil Toolchain Engineer

packaging: do not package libdir/ceph recursively

[Alexandre Oliva]

My earlier patch was partially redundant with commit e60dcfa80dec, that
didn't make 0.76, so here's the non-redundant change, as a separate
patch.

---

Package libdir/ceph non-recursively, to avoid duplicates, and
package libdir/ceph/ceph_common.sh explicitly.

Signed-off-by: Alexandre Oliva <oliva@gnu.org>
---
 ceph.spec.in |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ceph.spec.in b/ceph.spec.in
index 76c8344..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*


-- 
Alexandre Oliva, freedom fighter    http://FSFLA.org/~lxoliva/
You must be the change you wish to see in the world. -- Gandhi
Be Free! -- http://FSFLA.org/   FSF Latin America board member
Free Software Evangelist     Red Hat Brazil Toolchain Engineer

Re: packaging: do not package libdir/ceph recursively

[Ken Dreyer]

On Wed, Feb 12, 2014 at 10:46 AM, Alexandre Oliva <oliva@gnu.org> wrote:
> My earlier patch was partially redundant with commit e60dcfa80dec, that
> didn't make 0.76, so here's the non-redundant change, as a separate
> patch.

Thank you! I've added my signed-off-by and submitted it for inclusion
in master here: https://github.com/ceph/ceph/pull/1224

- Ken