From: Ken Dreyer <kdreyer@redhat.com>
Date: Mon, 13 Jul 2015 17:51:28 +0000 (-0600)
Subject: ceph.spec.in: fix libs-compat / devel-compat conditional
X-Git-Tag: v10.0.0~90^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=50b4bdc18a34ed5b9833bc8ee5d1abbe9100107c;p=ceph.git

ceph.spec.in: fix libs-compat / devel-compat conditional

In the RPM .spec's %files list, the "with libs-compat" conditional was
inadvertantly exended to cover the files list for ceph-devel-compat as
well.

The "with libs-compat" conditional should only cover the
"ceph-libs-compat" package, and not affect "ceph-devel-compat".

http://tracker.ceph.com/issues/12315 Fixes: #12315

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index 8efbb667bd3f..24a7b8f3811a 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -996,12 +996,12 @@ ln -sf %{_libdir}/librbd.so.1 /usr/lib64/qemu/librbd.so.1
 %files libs-compat
 # We need an empty %%files list for ceph-libs-compat, to tell rpmbuild to actually
 # build this meta package.
+%endif
 
 #################################################################################
 %files devel-compat
 # We need an empty %%files list for ceph-devel-compat, to tell rpmbuild to
 # actually build this meta package.
-%endif
 
 #################################################################################
 %files -n python-ceph-compat