]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
ceph.spec.in: loosen ceph-test's dependencies
authorKen Dreyer <kdreyer@redhat.com>
Wed, 4 Mar 2015 22:01:34 +0000 (15:01 -0700)
committerJosh Durgin <jdurgin@redhat.com>
Thu, 5 Mar 2015 18:57:18 +0000 (10:57 -0800)
In Debian, the ceph-test package can be installed with any version of
ceph-common.

Prior to this commit, in RHEL, we're much more strict about which
version of the dependencies we require. We depend directly on
librados2/librbd1/libcephfs1 instead of ceph-common, and we also require
the specific versions of these libraries to match the version of
ceph-test.

For testing Ceph, it is nice to have the ability to upgrade the
librados2/librbd1/libcephfs1 libraries on a host without having to also
upgrade the ceph-test package as well.

Remove the version number requirements, and change the dependencies from
librados2/librbd1/libcephfs1 to simply "ceph-common". That will make
/etc/ceph/ and /var/log/ceph present for the tests.

http://tracker.ceph.com/issues/10989 Refs: #10989

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 924f85f157b8acfe753d944dae49fca390da37aa)

ceph.spec.in

index fdbd2da88f70da5f4bd31b9ea19e43b4f1205932..567586cdb0b41a82ba5a02b34b5d738cf1b5b991 100644 (file)
@@ -315,9 +315,7 @@ RESTful bencher that can be used to benchmark radosgw performance.
 Summary:       Ceph benchmarks and test tools
 Group:         System Environment/Libraries
 License:       LGPL-2.0
-Requires:      librados2 = %{epoch}:%{version}-%{release}
-Requires:      librbd1 = %{epoch}:%{version}-%{release}
-Requires:      libcephfs1 = %{epoch}:%{version}-%{release}
+Requires:      ceph-common
 %if (0%{?fedora} >= 20 || 0%{?rhel} == 6)
 BuildRequires: lttng-ust-devel
 BuildRequires: libbabeltrace-devel